--- tools/spicy.c	2018-08-30 13:09:28.000000000 -0300
+++ tools/spicy.c	2018-11-16 19:17:35.566512247 -0200
@@ -469,6 +469,15 @@
     g_key_file_set_boolean(keyfile, "ui", "statusbar", state);
 }
 
+static void menu_cb_menubar(GtkToggleAction *action, gpointer data)
+{
+    SpiceWindow *win = data;
+    gboolean state = gtk_toggle_action_get_active(action);
+
+    gtk_widget_set_visible(win->menubar, state);
+    g_key_file_set_boolean(keyfile, "ui", "menubar", state);
+}
+
 static void menu_cb_about(GtkAction *action, void *data)
 {
     char *comments = "gtk test client app for the\n"
@@ -518,10 +527,14 @@
             gboolean state;
             GtkAction *toggle;
 
-            gtk_widget_show(win->menubar);
+            toggle = gtk_action_group_get_action(win->ag, "Menubar");
+            state = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(toggle));
+            gtk_widget_set_visible(win->menubar, state);
+
             toggle = gtk_action_group_get_action(win->ag, "Toolbar");
             state = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(toggle));
             gtk_widget_set_visible(win->toolbar, state);
+
             toggle = gtk_action_group_get_action(win->ag, "Statusbar");
             state = gtk_toggle_action_get_active(GTK_TOGGLE_ACTION(toggle));
             gtk_widget_set_visible(win->statusbar, state);
@@ -677,6 +690,10 @@
     }
     g_clear_error(&error);
 
+    state = g_key_file_get_boolean(keyfile, "ui", "menubar", &error);
+    if (error == NULL)
+        gtk_widget_set_visible(win->menubar, state);
+    g_clear_error(&error);
 
     state = g_key_file_get_boolean(keyfile, "ui", "toolbar", &error);
     if (error == NULL)
@@ -850,6 +867,11 @@
         .name        = "Toolbar",
         .label       = "Toolbar",
         .callback    = G_CALLBACK(menu_cb_toolbar),
+    },{
+        .name        = "Menubar",
+        .label       = "Menubar",
+        .callback    = G_CALLBACK(menu_cb_menubar),
+        .accelerator = "<shift>F6",
     }
 };
 
@@ -924,6 +946,7 @@
 "      <menuitem action='Fullscreen'/>\n"
 "      <menuitem action='Toolbar'/>\n"
 "      <menuitem action='Statusbar'/>\n"
+"      <menuitem action='Menubar'/>\n"
 "    </menu>\n"
 "    <menu action='InputMenu'>\n"
 #ifdef USE_SMARTCARD