diff --git a/syncplay/messages.py b/syncplay/messages.py
index 06ca3e1..c1b88d1 100755
--- a/syncplay/messages.py
+++ b/syncplay/messages.py
@@ -235,6 +235,7 @@ en = {
       "openstreamurl-menu-label" : "Open &media stream URL",
       "exit-menu-label" : "E&xit",
       "advanced-menu-label" : "&Advanced",
+      "window-menu-label" : "&Window",
       "setoffset-menu-label" : "Set &offset",
       "createcontrolledroom-menu-label" : "&Create controlled room",
       "identifyascontroller-menu-label" : "&Identify as room controller",
@@ -574,6 +575,7 @@ ru = {
       "openstreamurl-menu-label" : u"Open &media stream URL", # TODO: Translate into Russian
       "exit-menu-label" : u"&Выход",
       "advanced-menu-label" : u"&Дополнительно",
+      "window-menu-label" : u"&Window", # TODO: Translate into Russian
       "setoffset-menu-label" : u"Установить &смещение",
       "createcontrolledroom-menu-label" : u"&Create controlled room", # TODO: Translate into Russian
       "identifyascontroller-menu-label" : u"&Identify as room controller", # TODO: Translate into Russian
@@ -910,6 +912,7 @@ de = {
       "openstreamurl-menu-label" : u"Open &media stream URL", # TODO: Translate into German
       "exit-menu-label" : u"&Beenden",
       "advanced-menu-label" : u"&Erweitert",
+      "window-menu-label" : u"&Window", # TODO: Translate into German
       "setoffset-menu-label" : u"&Offset einstellen",
       "createcontrolledroom-menu-label" : u"&Zentral gesteuerten Raum erstellen",
       "identifyascontroller-menu-label" : u"Als Raumleiter &identifizieren",
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index f35c667..ac4e9be 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -556,14 +556,18 @@ class MainWindow(QtGui.QMainWindow):
                                                                     getMessage("identifyascontroller-menu-label"))
         window.identifyascontroller.triggered.connect(self.identifyAsController)
 
-        window.playbackAction = window.advancedMenu.addAction(getMessage("playbackbuttons-menu-label"))
+        # Window menu
+
+        window.windowMenu = QtGui.QMenu(getMessage("window-menu-label"), self)
+
+        window.playbackAction = window.windowMenu.addAction(getMessage("playbackbuttons-menu-label"))
         window.playbackAction.setCheckable(True)
         window.playbackAction.triggered.connect(self.updatePlaybackFrameVisibility)
 
-        window.autoplayAction = window.advancedMenu.addAction(getMessage("autoplay-menu-label"))
+        window.autoplayAction = window.windowMenu.addAction(getMessage("autoplay-menu-label"))
         window.autoplayAction.setCheckable(True)
         window.autoplayAction.triggered.connect(self.updateAutoplayVisibility)
-        window.menuBar.addMenu(window.advancedMenu)
+        window.menuBar.addMenu(window.windowMenu)
 
 
         # Help menu