diff --git a/src/ghtml-webkit.c b/src/ghtml-webkit.c
index 3c134d0..168059a 100644
--- a/src/ghtml-webkit.c
+++ b/src/ghtml-webkit.c
@@ -333,6 +333,9 @@ static gboolean _on_web_view_ready(WebKitWebView * view, gpointer data)
 	if(b == FALSE)
 		gtk_widget_hide(surfer->menubar);
 #endif
+	g_object_get(G_OBJECT(features), "toolbar-visible", &b, NULL);
+	if(b == FALSE)
+		gtk_widget_hide(surfer->toolbar);
 	g_object_get(G_OBJECT(features), "statusbar-visible", &b, NULL);
 	if(b == FALSE)
 		gtk_widget_hide(surfer->statusbox);
diff --git a/src/surfer.c b/src/surfer.c
index 8f6a2ff..65ab9ac 100644
--- a/src/surfer.c
+++ b/src/surfer.c
@@ -152,7 +152,8 @@ Surfer * surfer_new(char const * url)
 	gtk_box_pack_start(GTK_BOX(vbox), surfer->menubar, FALSE, FALSE, 0);
 #endif
 	/* toolbar */
-	toolbar = gtk_toolbar_new();
+	surfer->toolbar = gtk_toolbar_new();
+	toolbar = surfer->toolbar;
 	surfer->tb_back = gtk_tool_button_new_from_stock(GTK_STOCK_GO_BACK);
 	g_signal_connect(G_OBJECT(surfer->tb_back), "clicked", G_CALLBACK(
 				on_back), surfer);
diff --git a/src/surfer.h b/src/surfer.h
index 204871d..95e05bb 100644
--- a/src/surfer.h
+++ b/src/surfer.h
@@ -49,6 +49,7 @@ typedef struct _Surfer
 #ifndef FOR_EMBEDDED
 	GtkWidget * menubar;
 #endif
+	GtkWidget * toolbar;
 	GtkToolItem * tb_back;
 	GtkToolItem * tb_forward;
 	GtkToolItem * tb_stop;