diff --git a/src/main/python/main/ayab/menu.py b/src/main/python/main/ayab/menu.py
index 65e234aa..ad2e5977 100644
--- a/src/main/python/main/ayab/menu.py
+++ b/src/main/python/main/ayab/menu.py
@@ -19,6 +19,7 @@
 #    https://github.com/AllYarnsAreBeautiful/ayab-desktop
 
 from __future__ import annotations
+from PySide6.QtCore import QOperatingSystemVersion
 from PySide6.QtWidgets import QMenuBar
 
 from .menu_gui import Ui_MenuBar
@@ -38,6 +39,11 @@ class Menu(QMenuBar):
 
     def __init__(self, parent: GuiMain):
         super().__init__(parent)
+
+        # Use native menubar on macOS, not elsewhere (i.e. Linux)
+        if QOperatingSystemVersion.currentType() != QOperatingSystemVersion.OSType.MacOS:
+            self.setNativeMenuBar(False)
+
         self.ui = Ui_MenuBar()
         self.ui.setupUi(self)
         self.setup()
diff --git a/src/main/python/main/ayab/menu_gui.ui b/src/main/python/main/ayab/menu_gui.ui
index b0f47cb7..10e25cfc 100644
--- a/src/main/python/main/ayab/menu_gui.ui
+++ b/src/main/python/main/ayab/menu_gui.ui
@@ -2,9 +2,6 @@
 <ui version="4.0">
  <class>MenuBar</class>
  <widget class="QMenuBar" name="menubar">
-  <property name="nativeMenuBar">
-   <bool>False</bool>
-  </property>
   <widget class="QMenu" name="menu_file">
    <property name="title">
     <string>File</string>
@@ -68,6 +65,9 @@
    <property name="shortcut">
     <string notr="true">Ctrl+Q</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::QuitRole</enum>
+   </property>
   </action>
   <action name="action_load_AYAB_firmware">
    <property name="text">
@@ -99,6 +99,9 @@
    <property name="text">
     <string>Help – About</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::AboutRole</enum>
+   </property>
   </action>
   <action name="action_help">
    <property name="text">
@@ -192,6 +195,9 @@
    <property name="shortcut">
     <string notr="true">Ctrl+P</string>
    </property>
+   <property name="menuRole">
+    <enum>QAction::PreferencesRole</enum>
+   </property>
   </action>
  </widget>
  <resources/>