diff --git a/panels/network/connection-editor/connection-editor.ui b/panels/network/connection-editor/connection-editor.ui
index 78c4ba9ae..0d48cec15 100644
--- a/panels/network/connection-editor/connection-editor.ui
+++ b/panels/network/connection-editor/connection-editor.ui
@@ -77,7 +77,7 @@
                         <property name="model">details_store</property>
                         <property name="headers_visible">False</property>
                         <property name="headers_clickable">False</property>
-                        <property name="search_column">0</property>
+                        <property name="enable-search">False</property>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection" id="details_page_list_selection"/>
                         </child>
diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
index 07705c9be..e145fe036 100644
--- a/panels/network/connection-editor/net-connection-editor.c
+++ b/panels/network/connection-editor/net-connection-editor.c
@@ -59,7 +59,8 @@ selection_changed (GtkTreeSelection *selection, NetConnectionEditor *editor)
         GtkTreeIter iter;
         gint page;
 
-        gtk_tree_selection_get_selected (selection, &model, &iter);
+        if (!gtk_tree_selection_get_selected (selection, &model, &iter))
+                return;
         gtk_tree_model_get (model, &iter, 1, &page, -1);
 
         widget = GTK_WIDGET (gtk_builder_get_object (editor->builder,