diff --git a/src/qml/ApplicationMenu.qml b/src/qml/ApplicationMenu.qml
--- a/src/qml/ApplicationMenu.qml
+++ b/src/qml/ApplicationMenu.qml
@@ -17,9 +17,7 @@
  */
 
 import QtQuick 2.7
-//explore menu from Qt 5.10 once we can require it, but it is item-based
-import QtQuick.Controls 1.4
-import org.kde.elisa 1.0
+import QtQuick.Controls 2.3
 
 Menu {
     id: applicationMenu
@@ -33,71 +31,68 @@
     property var configureAction: elisa.action("options_configure")
     property var togglePlaylistAction: elisa.action("toggle_playlist")
 
-    MenuItem {
+    Action {
+        id: configureID
         text: configureAction.text
+        icon.name: elisa.iconName(configureAction.icon)
         shortcut: configureAction.shortcut
-        iconName: elisa.iconName(configureAction.icon)
         onTriggered: configureAction.trigger()
-        visible: configureAction.text !== ""
     }
 
-    MenuItem {
+    Action {
+        id: shortcutsID
         text: configureShortcutsAction.text
+        icon.name: elisa.iconName(configureShortcutsAction.icon)
         shortcut: configureShortcutsAction.shortcut
-        iconName: elisa.iconName(configureShortcutsAction.icon)
         onTriggered: configureShortcutsAction.trigger()
-        visible: configureShortcutsAction.text !== ""
     }
 
-    MenuItem {
-        shortcut: togglePlaylistAction.shortcut
+    Action {
+        id: toggleID
         text: contentView.showPlaylist ? i18nc("Hide playlist", "Hide Playlist") : i18nc("Show playlist", "Show Playlist")
-        iconName: "view-media-playlist"
+        icon.name: "view-media-playlist"
+        shortcut: togglePlaylistAction.shortcut
         onTriggered: contentView.showPlaylist = !contentView.showPlaylist
-        enabled: contentView.currentViewIndex != 0
     }
 
-    MenuSeparator {
-        visible: reportBugAction.text !== ""
-    }
+    MenuSeparator { }
 
-    MenuItem {
+    Action {
+        id: reportID
         text: reportBugAction.text
+        icon.name: elisa.iconName(reportBugAction.icon)
         shortcut: reportBugAction.shortcut
-        iconName: elisa.iconName(reportBugAction.icon)
         onTriggered: reportBugAction.trigger()
-        visible: reportBugAction.text !== ""
+        enabled: reportBugAction.text !== ""
     }
 
-    MenuSeparator {
-        visible: helpAction.text !== ""
-    }
+    MenuSeparator { }
 
-    MenuItem {
+    Action {
+        id: helpID
         text: helpAction.text
+        icon.name: elisa.iconName(helpAction.icon)
         shortcut: helpAction.shortcut
-        iconName: elisa.iconName(helpAction.icon)
         onTriggered: helpAction.trigger()
-        visible: helpAction.text !== ""
+        enabled: helpAction.text !== ""
     }
 
-    MenuItem {
+    Action {
+        id: aboutID
         text: aboutAppAction.text
+        icon.name: elisa.iconName(aboutAppAction.icon)
         shortcut: aboutAppAction.shortcut
-        iconName: elisa.iconName(aboutAppAction.icon)
         onTriggered: aboutAppAction.trigger()
-        visible: aboutAppAction.text !== ""
     }
 
-    MenuSeparator {
-        visible: quitApplication.text !== ""
-    }
+    MenuSeparator { }
 
-    MenuItem {
+    Action {
+        id: quitID
         text: quitApplication.text
+        icon.name: elisa.iconName(quitApplication.icon)
         shortcut: quitApplication.shortcut
-        iconName: elisa.iconName(quitApplication.icon)
         onTriggered: quitApplication.trigger()
-        visible: quitApplication.text !== ""
+        enabled: quitApplication.text !== ""
     }
 }