diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 8ef7f3f5f6..0c58880681 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -95,9 +95,6 @@ struct _GtkPlacesView
   GtkSizeGroup                  *path_size_group;
   GtkSizeGroup                  *space_size_group;
 
-  GtkEntryCompletion            *address_entry_completion;
-  GtkListStore                  *completion_store;
-
   GCancellable                  *networks_fetching_cancellable;
 
   GtkPlacesViewRow              *row_for_action;
@@ -552,12 +549,9 @@ populate_servers (GtkPlacesView *view)
   while ((child = gtk_widget_get_first_child (GTK_WIDGET (view->recent_servers_listbox))))
     gtk_list_box_remove (GTK_LIST_BOX (view->recent_servers_listbox), child);
 
-  gtk_list_store_clear (view->completion_store);
-
   for (i = 0; i < num_uris; i++)
     {
       RemoveServerData *data;
-      GtkTreeIter iter;
       GtkWidget *row;
       GtkWidget *grid;
       GtkWidget *button;
@@ -568,14 +562,6 @@ populate_servers (GtkPlacesView *view)
       name = g_bookmark_file_get_title (server_list, uris[i], NULL);
       dup_uri = g_strdup (uris[i]);
 
-      /* add to the completion list */
-      gtk_list_store_append (view->completion_store, &iter);
-      gtk_list_store_set (view->completion_store,
-                          &iter,
-                          0, name,
-                          1, uris[i],
-                          -1);
-
       /* add to the recent servers listbox */
       row = gtk_list_box_row_new ();
 
@@ -2300,8 +2286,6 @@ gtk_places_view_class_init (GtkPlacesViewClass *klass)
 
   gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, actionbar);
   gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, address_entry);
-  gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, address_entry_completion);
-  gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, completion_store);
   gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, connect_button);
   gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, listbox);
   gtk_widget_class_bind_template_child (widget_class, GtkPlacesView, recent_servers_listbox);
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 729a50073d..a0de3ded57 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -1,17 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
-  <object class="GtkListStore" id="completion_store">
-    <columns>
-      <column type="gchararray"/>
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkEntryCompletion" id="address_entry_completion">
-    <property name="model">completion_store</property>
-    <property name="text-column">1</property>
-    <property name="inline-completion">1</property>
-    <property name="popup-completion">0</property>
-  </object>
   <object class="GtkPopover" id="server_adresses_popover">
     <property name="position">2</property>
     <child>
@@ -276,7 +264,6 @@
                 <property name="width-chars">20</property>
                 <property name="placeholder-text" translatable="yes">Enter server address…</property>
                 <property name="secondary-icon-name">dialog-question-symbolic</property>
-                <property name="completion">address_entry_completion</property>
                 <signal name="notify::text" handler="on_address_entry_text_changed" object="GtkPlacesView" swapped="yes"/>
                 <signal name="activate" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
                 <signal name="icon-press" handler="on_address_entry_show_help_pressed" object="GtkPlacesView" swapped="yes"/>