diff --git a/src/juci.cpp b/src/juci.cpp
index b50656b..b7e1487 100644
--- a/src/juci.cpp
+++ b/src/juci.cpp
@@ -121,14 +121,7 @@ void Application::on_startup() {
   Gtk::Application::on_startup();
 
   Menu::get().build();
-
-  if(!Menu::get().juci_menu || !Menu::get().window_menu) {
-    std::cerr << "Menu not found." << std::endl;
-  }
-  else {
-    set_app_menu(Menu::get().juci_menu);
-    set_menubar(Menu::get().window_menu);
-  }
+  set_menubar(Menu::get().window_menu);
 }
 
 Application::Application() : Gtk::Application("no.sout.juci", Gio::APPLICATION_NON_UNIQUE | Gio::APPLICATION_HANDLES_COMMAND_LINE) {
diff --git a/src/menu.cpp b/src/menu.cpp
index 2f819a7..11846ba 100644
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -87,38 +87,39 @@ const Glib::ustring menu_xml = R"RAW(<interface>
       </item>
     </section>
   </menu>
-  <menu id='juci-menu'>
-    <section>
-      <item>
-        <attribute name='label' translatable='yes'>_About</attribute>
-        <attribute name='action'>app.about</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name='label' translatable='yes'>_Preferences</attribute>
-        <attribute name='action'>app.preferences</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name='label' translatable='yes'>_Snippets</attribute>
-        <attribute name='action'>app.snippets</attribute>
-      </item>
-      <item>
-        <attribute name='label' translatable='yes'>_Commands</attribute>
-        <attribute name='action'>app.commands</attribute>
-      </item>
-    </section>
-    <section>
-      <item>
-        <attribute name='label' translatable='yes'>_Quit</attribute>
-        <attribute name='action'>app.quit</attribute>
-      </item>
-    </section>
-  </menu>
 
   <menu id='window-menu'>
+    <submenu id='juci-menu'>
+      <attribute name='label' translatable='yes'>_juci++</attribute>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_About</attribute>
+          <attribute name='action'>app.about</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Preferences</attribute>
+          <attribute name='action'>app.preferences</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Snippets</attribute>
+          <attribute name='action'>app.snippets</attribute>
+        </item>
+        <item>
+          <attribute name='label' translatable='yes'>_Commands</attribute>
+          <attribute name='action'>app.commands</attribute>
+        </item>
+      </section>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Quit</attribute>
+          <attribute name='action'>app.quit</attribute>
+        </item>
+      </section>
+    </submenu>
     <submenu>
       <attribute name='label' translatable='yes'>_File</attribute>
       <section>