diff --git a/shell/ev-sidebar.c b/shell/ev-sidebar.c
index 492abb8..cc2a00e 100644
--- a/shell/ev-sidebar.c
+++ b/shell/ev-sidebar.c
@@ -508,6 +508,7 @@ ev_sidebar_document_changed_cb (EvDocumentModel *model,
 
 		if (ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (widget),	document)) {
 			has_pages = TRUE;
+			gtk_widget_set_sensitive (menu_widget, TRUE);
 		} else {
 			gtk_widget_set_sensitive (menu_widget, FALSE);
 		}
diff --git a/shell/ev-window.c b/shell/ev-window.c
index a4f8a8a..c12348a 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -1008,7 +1008,10 @@ ev_window_sidebar_set_current_page (EvWindow    *window,
 	} else if (strcmp (page_id, BOOKMARKS_SIDEBAR_ID) == 0 &&
 		   ev_sidebar_page_support_document (EV_SIDEBAR_PAGE (bookmarks), document)) {
 		ev_sidebar_set_page (sidebar, bookmarks);
-	}
+	} else {
+    /* setup thumbnails by default */
+		ev_sidebar_set_page (sidebar, thumbs);
+  }
 }
 
 static void
@@ -1210,8 +1213,6 @@ setup_document_from_metadata (EvWindow *window)
 	if (!window->priv->metadata)
 		return;
 
-	setup_sidebar_from_metadata (window);
-
 	/* Make sure to not open a document on the last page,
 	 * since closing it on the last page most likely means the
 	 * user was finished reading the document. In that case, reopening should
@@ -2203,6 +2204,7 @@ ev_window_open_document (EvWindow       *ev_window,
 	ev_document_model_set_document (ev_window->priv->model, document);
 
 	setup_document_from_metadata (ev_window);
+  setup_sidebar_from_metadata(ev_window);
 	setup_view_from_metadata (ev_window);
 
 	if (dest) {
@@ -4847,6 +4849,7 @@ ev_window_document_changed_cb (EvDocumentModel *model,
 {
 	ev_window_set_document (ev_window,
 				ev_document_model_get_document (model));
+  setup_sidebar_from_metadata(ev_window);
 }
 
 static void
