--- mysql-workbench-6.3.5/frontend/linux/workbench/main_form.cpp	2015-10-31 15:26:34.945113824 +0100
+++ mysql-workbench-6.3.5.0/frontend/linux/workbench/main_form.cpp	2015-10-31 17:03:11.233299305 +0100
@@ -1278,29 +1278,6 @@
 }
 
 //------------------------------------------------------------------------------
-/**
- * @note Ubuntu Unity Desktop
- * Each page in Notebook has a Gtk::MenuBar than are moved to the menuproxy
- * This means that some menu item are duplicated
- * This function fix it by hidding the menubar not visible
- */
-static void FIX_BUG_UBUNTU_MENUPROXY(Gtk::Notebook* notebook, int page_num)
-{
-    int num_pages = notebook->get_n_pages();
-    int i;
-    for(i=0; i<num_pages; i++) {
-        Gtk::Widget *page = notebook->get_nth_page(i);
-        Gtk::Widget *widget = *static_cast<Gtk::Container*>(page)->get_children().begin();
-        if (widget->get_name() == "gtkmm__GtkMenuBar" || widget->get_name() == "home") {
-            if (i==page_num) {
-                widget->show_all();// show the menubar
-            } else {
-                widget->hide_all();// hide the menubar
-            }
-        }
-    }
-}
-
 void MainForm::switch_page(GtkNotebookPage*, guint pagenum)
 {
   if (_gui_locked)
@@ -1319,8 +1296,6 @@
       form->on_activate();
   }
   _wbui_context->get_command_ui()->revalidate_edit_menu_items();
-
-  FIX_BUG_UBUNTU_MENUPROXY(note, (int) pagenum);
 }