diff --git a/novelwriter/gui/mainmenu.py b/novelwriter/gui/mainmenu.py
index 79361feb..746de344 100644
--- a/novelwriter/gui/mainmenu.py
+++ b/novelwriter/gui/mainmenu.py
@@ -40,6 +40,10 @@ logger = logging.getLogger(__name__)
 
 
 class GuiMainMenu(QMenuBar):
+    """The GUI main menu. All menu actions are defined here with the
+    main menu as the owner. Each widget that need them elsewhere need to
+    add them from this class.
+    """
 
     def __init__(self, mainGui):
         super().__init__(parent=mainGui)
@@ -164,7 +168,7 @@ class GuiMainMenu(QMenuBar):
 
         # Project > Edit
         self.aEditItem = QAction(self.tr("Rename Item"), self)
-        self.aEditItem.setShortcuts(["F2"])
+        self.aEditItem.setShortcut("F2")
         self.aEditItem.triggered.connect(lambda: self.mainGui.editItemLabel(None))
         self.projMenu.addAction(self.aEditItem)
 
diff --git a/novelwriter/gui/viewsbar.py b/novelwriter/gui/viewsbar.py
index 4d19f818..aff29b56 100644
--- a/novelwriter/gui/viewsbar.py
+++ b/novelwriter/gui/viewsbar.py
@@ -67,37 +67,37 @@ class GuiViewsBar(QToolBar):
         stretch.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
         # Actions
-        self.aProject = QAction(self.tr("Project"))
+        self.aProject = QAction(self.tr("Project"), self)
         self.aProject.setFont(lblFont)
         self.aProject.setToolTip(self.tr("Show project tree and editor"))
         self.aProject.setIcon(self.mainTheme.getIcon("view_editor"))
         self.aProject.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.PROJECT))
 
-        self.aNovel = QAction(self.tr("Novel"))
+        self.aNovel = QAction(self.tr("Novel"), self)
         self.aNovel.setFont(lblFont)
         self.aNovel.setToolTip(self.tr("Show novel tree and editor"))
         self.aNovel.setIcon(self.mainTheme.getIcon("view_novel"))
         self.aNovel.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.NOVEL))
 
-        self.aOutline = QAction(self.tr("Outline"))
+        self.aOutline = QAction(self.tr("Outline"), self)
         self.aOutline.setFont(lblFont)
         self.aOutline.setToolTip(self.tr("Show novel outline"))
         self.aOutline.setIcon(self.mainTheme.getIcon("view_outline"))
         self.aOutline.triggered.connect(lambda: self.viewChangeRequested.emit(nwView.OUTLINE))
 
-        self.aBuild = QAction(self.tr("Build"))
+        self.aBuild = QAction(self.tr("Build"), self)
         self.aBuild.setFont(lblFont)
         self.aBuild.setToolTip(self.tr("Build novel project"))
         self.aBuild.setIcon(self.mainTheme.getIcon("view_build"))
         self.aBuild.triggered.connect(lambda: self.mainGui.showBuildProjectDialog())
 
-        self.aDetails = QAction(self.tr("Details"))
+        self.aDetails = QAction(self.tr("Details"), self)
         self.aDetails.setFont(lblFont)
         self.aDetails.setToolTip(self.tr("Show project details"))
         self.aDetails.setIcon(self.mainTheme.getIcon("proj_details"))
         self.aDetails.triggered.connect(lambda: self.mainGui.showProjectDetailsDialog())
 
-        self.aStats = QAction(self.tr("Stats"))
+        self.aStats = QAction(self.tr("Stats"), self)
         self.aStats.setFont(lblFont)
         self.aStats.setToolTip(self.tr("Show project statistics"))
         self.aStats.setIcon(self.mainTheme.getIcon("proj_stats"))
@@ -106,13 +106,10 @@ class GuiViewsBar(QToolBar):
         # Settings Menu
         self.mSettings = QMenu()
 
-        self.aPrjSettings = QAction(self.tr("Project Settings"))
-        self.aPrjSettings.triggered.connect(lambda: self.mainGui.showProjectSettingsDialog())
-        self.mSettings.addAction(self.aPrjSettings)
-
-        self.aPreferences = QAction(self.tr("Preferences"))
-        self.aPreferences.triggered.connect(lambda: self.mainGui.showPreferencesDialog())
-        self.mSettings.addAction(self.aPreferences)
+        self.mSettings.addAction(self.mainGui.mainMenu.aEditWordList)
+        self.mSettings.addAction(self.mainGui.mainMenu.aProjectSettings)
+        self.mSettings.addSeparator()
+        self.mSettings.addAction(self.mainGui.mainMenu.aPreferences)
 
         self.tbSettings = QToolButton(self)
         self.tbSettings.setFont(lblFont)