diff --git a/src/gui/gcal-search-button.blp b/src/gui/gcal-search-button.blp
index a500ba87..e4219dba 100644
--- a/src/gui/gcal-search-button.blp
+++ b/src/gui/gcal-search-button.blp
@@ -76,6 +76,7 @@ template $GcalSearchButton: Adw.Bin {
 Popover popover {
   position: bottom;
   autohide: false;
+  has-arrow: false;
   default-widget: results_listview;
 
   styles [
diff --git a/src/gui/gcal-search-button.c b/src/gui/gcal-search-button.c
index e6f75623..f13a5087 100644
--- a/src/gui/gcal-search-button.c
+++ b/src/gui/gcal-search-button.c
@@ -116,6 +116,9 @@ escape_markup_cb (GcalSearchHit *hit,
 {
   g_autofree gchar *escaped_string = NULL;
 
+  if (!string)
+    return NULL;
+
   escaped_string = g_markup_escape_text (string, -1);
   escaped_string = g_strstrip (escaped_string);