diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index df29dd2c..bee07257 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -505,6 +505,8 @@ midori_location_action_popup_timeout_cb (gpointer data)
             g_free (uri);
             g_free (title);
             i++;
+            if (i > 4)
+                break;
         }
         searches += i;
     }
diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c
index 8bbabc74..405edfc1 100644
--- a/midori/midori-preferences.c
+++ b/midori/midori-preferences.c
@@ -449,8 +449,6 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
     SPANNED_ADD (button);
     button = katze_property_proxy (settings, "progress-in-location", NULL);
     INDENTED_ADD (button);
-    button = katze_property_proxy (settings, "search-engines-in-completion", NULL);
-    SPANNED_ADD (button);
     #endif
     FRAME_NEW (_("Browsing"));
     label = katze_property_label (settings, "open-new-pages-in");