diff --git a/markdown/src/plugin.c b/markdown/src/plugin.c
index ea5d5d719..311edff9e 100644
--- a/markdown/src/plugin.c
+++ b/markdown/src/plugin.c
@@ -52,7 +52,6 @@ static void on_export_as_html_activate(GtkMenuItem *item, MarkdownViewer *viewer
 /* Plugin entry point on activation. */
 static gboolean md_plugin_init(GeanyPlugin *plugin, gpointer data)
 {
-  gint page_num;
   gchar *conf_fn;
   MarkdownConfig *conf;
   MarkdownConfigViewPos view_pos;
@@ -79,16 +78,15 @@ static gboolean md_plugin_init(GeanyPlugin *plugin, gpointer data)
 
   if (view_pos == MARKDOWN_CONFIG_VIEW_POS_MSGWIN) {
     nb = GTK_NOTEBOOK(geany_plugin->geany_data->main_widgets->message_window_notebook);
-    page_num = gtk_notebook_append_page(nb,
+    gtk_notebook_append_page(nb,
       g_scrolled_win, gtk_label_new(MARKDOWN_PREVIEW_LABEL));
   } else {
     nb = GTK_NOTEBOOK(geany_plugin->geany_data->main_widgets->sidebar_notebook);
-    page_num = gtk_notebook_append_page(nb,
+    gtk_notebook_append_page(nb,
       g_scrolled_win, gtk_label_new(MARKDOWN_PREVIEW_LABEL));
   }
 
   gtk_widget_show_all(g_scrolled_win);
-  gtk_notebook_set_current_page(nb, page_num);
 
   g_signal_connect(conf, "notify::view-pos", G_CALLBACK(on_view_pos_notify), viewer);
 
diff --git a/treebrowser/src/treebrowser.c b/treebrowser/src/treebrowser.c
index 96e044f8c..0a3ff2a83 100644
--- a/treebrowser/src/treebrowser.c
+++ b/treebrowser/src/treebrowser.c
@@ -30,7 +30,6 @@
 GeanyPlugin 				*geany_plugin;
 GeanyData 					*geany_data;
 
-static gint 				page_number 				= 0;
 static GtkTreeStore 		*treestore;
 static GtkWidget 			*treeview;
 static GtkWidget 			*sidebar_vbox;
@@ -1997,7 +1996,7 @@ create_sidebar(void)
 
 	gtk_widget_show_all(sidebar_vbox);
 
-	page_number = gtk_notebook_append_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook),
+	gtk_notebook_append_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook),
 							sidebar_vbox, gtk_label_new(_("Tree Browser")));
 
 	showbars(CONFIG_SHOW_BARS);
@@ -2325,6 +2324,7 @@ project_open_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GN
 
 static void kb_activate(guint key_id)
 {
+	gint page_number = gtk_notebook_page_num(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), sidebar_vbox);
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(geany->main_widgets->sidebar_notebook), page_number);
 	switch (key_id)
 	{