diff --git a/src/platform/qt/Window.cpp b/src/platform/qt/Window.cpp
index ad3fc72f6..0934ba7a7 100644
--- a/src/platform/qt/Window.cpp
+++ b/src/platform/qt/Window.cpp
@@ -459,11 +459,6 @@ void Window::setupMenu(QMenuBar* menubar) {
 
 #ifndef Q_OS_MAC
 	fileMenu->addSeparator();
-#endif
-      fileMenu->addAction(tr("Settings"), this, SLOT(openSettingsWindow()));
-
-#ifndef Q_OS_MAC
-      fileMenu->addSeparator();
 	fileMenu->addAction(tr("E&xit"), this, SLOT(close()), QKeySequence::Quit);
 #endif
 
@@ -526,17 +521,6 @@ void Window::setupMenu(QMenuBar* menubar) {
 	audioSync->connect([this](const QVariant& value) { m_controller->setAudioSync(value.toBool()); });
 	m_config->updateOption("audioSync");
 
-	emulationMenu->addSeparator();
-	QAction* keymap = new QAction(tr("Remap keyboard..."), emulationMenu);
-	connect(keymap, SIGNAL(triggered()), this, SLOT(openKeymapWindow()));
-	emulationMenu->addAction(keymap);
-
-#ifdef BUILD_SDL
-	QAction* gamepad = new QAction(tr("Remap gamepad..."), emulationMenu);
-	connect(gamepad, SIGNAL(triggered()), this, SLOT(openGamepadWindow()));
-	emulationMenu->addAction(gamepad);
-#endif
-
 	QMenu* avMenu = menubar->addMenu(tr("Audio/&Video"));
 	QMenu* frameMenu = avMenu->addMenu(tr("Frame size"));
 	for (int i = 1; i <= 6; ++i) {
@@ -637,6 +621,19 @@ void Window::setupMenu(QMenuBar* menubar) {
 	toolsMenu->addAction(gdbWindow);
 #endif
 
+	toolsMenu->addSeparator();
+	toolsMenu->addAction(tr("Settings"), this, SLOT(openSettingsWindow()));
+
+	QAction* keymap = new QAction(tr("Remap keyboard..."), toolsMenu);
+	connect(keymap, SIGNAL(triggered()), this, SLOT(openKeymapWindow()));
+	toolsMenu->addAction(keymap);
+
+#ifdef BUILD_SDL
+	QAction* gamepad = new QAction(tr("Remap gamepad..."), toolsMenu);
+	connect(gamepad, SIGNAL(triggered()), this, SLOT(openGamepadWindow()));
+	toolsMenu->addAction(gamepad);
+#endif
+
 	ConfigOption* skipBios = m_config->addOption("skipBios");
 	skipBios->connect([this](const QVariant& value) { m_controller->setSkipBIOS(value.toBool()); });