diff --git i/extensions/cookie-manager/cookie-manager-page.c w/extensions/cookie-manager/cookie-manager-page.c
index d8a71ad..a88ed67 100644
--- i/extensions/cookie-manager/cookie-manager-page.c
+++ w/extensions/cookie-manager/cookie-manager-page.c
@@ -817,10 +817,10 @@ static void cm_filter_entry_changed_cb(GtkEditable *editable, CookieManagerPage
 
 	cookie_manager_update_filter(priv->parent, text);
 
-	if (*text != '\0')
-		gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview));
-	else
+	if (text && *text)
 		gtk_tree_view_collapse_all(GTK_TREE_VIEW(priv->treeview));
+	else
+		gtk_tree_view_expand_all(GTK_TREE_VIEW(priv->treeview));
 }
 
 
@@ -1019,6 +1019,9 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp)
 	CookieManagerPagePrivate *priv = cmp->priv;
 
 	treeview = priv->treeview = gtk_tree_view_new();
+	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
+	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
+	gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COOKIE_MANAGER_COL_NAME);
 
 	renderer = gtk_cell_renderer_text_new();
 	column = gtk_tree_view_column_new_with_attributes(
@@ -1030,10 +1033,10 @@ static GtkWidget *cm_tree_prepare(CookieManagerPage *cmp)
 	gtk_tree_view_column_set_cell_data_func(column, renderer,
         (GtkTreeCellDataFunc) cm_tree_render_text_cb, NULL, NULL);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column);
-
-	gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(treeview), TRUE);
-	gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
-	gtk_tree_view_set_search_column(GTK_TREE_VIEW(treeview), COOKIE_MANAGER_COL_NAME);
+	/* Expander column */
+	column = gtk_tree_view_column_new ();
+	gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+	gtk_tree_view_set_expander_column (GTK_TREE_VIEW (treeview), column);
 
 	/* selection handling */
 	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
diff --git i/panels/midori-bookmarks.c w/panels/midori-bookmarks.c
index 0a7b880..6aac5e7 100644
--- i/panels/midori-bookmarks.c
+++ w/panels/midori-bookmarks.c
@@ -1053,7 +1053,9 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
     model = gtk_tree_store_new (2, KATZE_TYPE_ITEM, G_TYPE_STRING);
     treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
+    gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), TRUE);
     gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
+
     column = gtk_tree_view_column_new ();
     gtk_tree_view_column_set_expand (column, TRUE);
     renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
@@ -1067,7 +1069,10 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
         (GtkTreeCellDataFunc)midori_bookmarks_treeview_render_text_cb,
         treeview, NULL);
     gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
-    gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), TRUE);
+    /* Expander column */
+    column = gtk_tree_view_column_new ();
+    gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+    gtk_tree_view_set_expander_column (GTK_TREE_VIEW (treeview), column);
     g_object_unref (model);
     g_object_connect (treeview,
                       "signal::row-activated",
diff --git i/panels/midori-history.c w/panels/midori-history.c
index 8c6edfd..12dd24f 100644
--- i/panels/midori-history.c
+++ w/panels/midori-history.c
@@ -1024,6 +1024,7 @@ midori_history_init (MidoriHistory* history)
     treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (model));
     gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (treeview), FALSE);
     gtk_tree_view_set_tooltip_column (GTK_TREE_VIEW (treeview), 1);
+
     column = gtk_tree_view_column_new ();
     gtk_tree_view_column_set_expand (column, TRUE);
     renderer_pixbuf = gtk_cell_renderer_pixbuf_new ();
@@ -1037,6 +1038,10 @@ midori_history_init (MidoriHistory* history)
         (GtkTreeCellDataFunc)midori_history_treeview_render_text_cb,
         treeview, NULL);
     gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+    /* Expander column */
+    column = gtk_tree_view_column_new ();
+    gtk_tree_view_append_column (GTK_TREE_VIEW (treeview), column);
+    gtk_tree_view_set_expander_column (GTK_TREE_VIEW (treeview), column);
     g_object_unref (model);
     g_object_connect (treeview,
                       "signal::row-activated",