diff --git a/src/MediaServer.qml b/src/MediaServer.qml
--- a/src/MediaServer.qml
+++ b/src/MediaServer.qml
@@ -338,25 +338,25 @@
         id: applicationMenu
         title: i18nc("open application menu", "Application Menu")
 
-        MenuItem {
-            action: qmlQuitAction
-            visible: qmlQuitAction.text !== ""
-        }
 
-        MenuSeparator {
-            visible: qmlQuitAction.text !== ""
+        MenuItem {
+            text: configureAction.text
+            shortcut: configureAction.shortcut
+            iconName: 'configure'
+            onTriggered: configureAction.trigger()
+            visible: configureAction.text !== ""
         }
 
         MenuItem {
-            text: helpAction.text
-            shortcut: helpAction.shortcut
-            iconName: elisa.iconName(helpAction.icon)
-            onTriggered: helpAction.trigger()
-            visible: helpAction.text !== ""
+            text: configureShortcutsAction.text
+            shortcut: configureShortcutsAction.shortcut
+            iconName: elisa.iconName(configureShortcutsAction.icon)
+            onTriggered: configureShortcutsAction.trigger()
+            visible: configureShortcutsAction.text !== ""
         }
 
         MenuSeparator {
-            visible: helpAction.text !== ""
+            visible: reportBugAction.text !== ""
         }
 
         MenuItem {
@@ -368,36 +368,34 @@
         }
 
         MenuSeparator {
-            visible: reportBugAction.text !== ""
+            visible: helpAction.text !== ""
         }
 
         MenuItem {
-            text: configureAction.text
-            shortcut: configureAction.shortcut
-            iconName: 'configure'
-            onTriggered: configureAction.trigger()
-            visible: configureAction.text !== ""
+            text: helpAction.text
+            shortcut: helpAction.shortcut
+            iconName: elisa.iconName(helpAction.icon)
+            onTriggered: helpAction.trigger()
+            visible: helpAction.text !== ""
         }
 
         MenuItem {
-            text: configureShortcutsAction.text
-            shortcut: configureShortcutsAction.shortcut
-            iconName: elisa.iconName(configureShortcutsAction.icon)
-            onTriggered: configureShortcutsAction.trigger()
-            visible: configureShortcutsAction.text !== ""
+            text: aboutAppAction.text
+            shortcut: aboutAppAction.shortcut
+            iconName: elisa.iconName(aboutAppAction.icon)
+            onTriggered: aboutAppAction.trigger()
+            visible: aboutAppAction.text !== ""
         }
 
         MenuSeparator {
-            visible: configureAction.text !== "" || configureShortcutsAction.text !== ""
+            visible: qmlQuitAction.text !== ""
         }
 
         MenuItem {
-            text: aboutAppAction.text
-            shortcut: aboutAppAction.shortcut
-            iconName: elisa.iconName(aboutAppAction.icon)
-            onTriggered: aboutAppAction.trigger()
-            visible: aboutAppAction.text !== ""
+            action: qmlQuitAction
+            visible: qmlQuitAction.text !== ""
         }
+
     }
 
     Action {