diff --git a/resources/qml/Menus/ExtensionMenu.qml b/resources/qml/Menus/ExtensionMenu.qml
index 909513e8ba..fe40658e01 100644
--- a/resources/qml/Menus/ExtensionMenu.qml
+++ b/resources/qml/Menus/ExtensionMenu.qml
@@ -27,7 +27,7 @@ Menu
     {
         id: extensionsMenuSeparator
 
-        MenuSeparator {}
+        Cura.MenuSeparator {}
     }
 
     Instantiator
@@ -35,7 +35,7 @@ Menu
         id: extensions
         model: extensionModel
 
-        UM.Menu
+        Cura.Menu
         {
             id: sub_menu
             title: model.name
diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index 751a2de1b4..ef2816ed87 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -7,7 +7,7 @@ import QtQuick.Controls 2.4
 import UM 1.5 as UM
 import Cura 1.0 as Cura
 
-UM.Menu
+Cura.Menu
 {
     id: materialMenu
     title: catalog.i18nc("@label:category menu label", "Material")
diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml
index 9699481db0..b320a02a5e 100644
--- a/resources/qml/Menus/NozzleMenu.qml
+++ b/resources/qml/Menus/NozzleMenu.qml
@@ -7,7 +7,7 @@ import QtQuick.Controls 2.4
 import UM 1.5 as UM
 import Cura 1.0 as Cura
 
-UM.Menu
+Cura.Menu
 {
     id: nozzleMenu
     title: "Nozzle"
diff --git a/resources/qml/Menus/OpenFilesMenu.qml b/resources/qml/Menus/OpenFilesMenu.qml
index 87c518f34c..dcce902170 100644
--- a/resources/qml/Menus/OpenFilesMenu.qml
+++ b/resources/qml/Menus/OpenFilesMenu.qml
@@ -9,7 +9,7 @@ import Cura 1.0 as Cura
 
 import "../Dialogs"
 
-UM.Menu
+Cura.Menu
 {
     id: openFilesMenu
     title: catalog.i18nc("@title:menu menubar:file", "Open File(s)...")
diff --git a/resources/qml/Menus/SaveProjectMenu.qml b/resources/qml/Menus/SaveProjectMenu.qml
index 46c767e33c..1b30546a89 100644
--- a/resources/qml/Menus/SaveProjectMenu.qml
+++ b/resources/qml/Menus/SaveProjectMenu.qml
@@ -9,7 +9,7 @@ import Cura 1.1 as Cura
 
 import "../Dialogs"
 
-UM.Menu
+Cura.Menu
 {
     id: saveProjectMenu
     title: catalog.i18nc("@title:menu menubar:file", "Save Project...")
diff --git a/resources/qml/Widgets/Menu.qml b/resources/qml/Widgets/Menu.qml
index 1c6a55c28a..b727adcb3a 100644
--- a/resources/qml/Widgets/Menu.qml
+++ b/resources/qml/Widgets/Menu.qml
@@ -2,20 +2,18 @@
 // Cura is released under the terms of the LGPLv3 or higher.
 
 import QtQuick 2.7
-import QtQuick.Controls 2.3
 
-import UM 1.1 as UM
+import UM 1.5 as UM
 
 //
 // Menu with Cura styling.
 //
-Menu
+UM.Menu
 {
     id: menu
     padding: 0
 
     implicitWidth: UM.Theme.getSize("setting_control").width
-    width: Math.max.apply(Math, Object.values(contentChildren).map(function(c) { return c.width }))
 
     background: Rectangle {
         color: UM.Theme.getColor("setting_control")