diff --git a/docs/menu.xml b/docs/menu.xml
index b1890b65..d03f8e71 100644
--- a/docs/menu.xml
+++ b/docs/menu.xml
@@ -15,7 +15,7 @@
   <item label="Decorations">
     <action name="ToggleDecorations" />
   </item>
-  <item label="AlwaysOnTop">
+  <item label="Always on Top">
     <action name="ToggleAlwaysOnTop" />
   </item>
   <!--
@@ -29,6 +29,10 @@
     <item label="Move right">
       <action name="SendToDesktop" to="right" />
     </item>
+    <separator />
+    <item label="Always on Visible Workspace">
+      <action name="ToggleOmnipresent" />
+    </item>
   </menu>
   <item label="Close">
     <action name="Close" />
diff --git a/po/de.po b/po/de.po
index 8706d693..f530c1e4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Dekorationen"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Immer im Vordergrund"
 
 #: src/menu/menu.c:662
diff --git a/po/es.po b/po/es.po
index 5e86b864..2252af5c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Decoraciones"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Siempre encima"
 
 #: src/menu/menu.c:662
diff --git a/po/id.po b/po/id.po
index 2acec2d1..46bea0f4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Dekorasi"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Selalu di Muka"
 
 #: src/menu/menu.c:662
diff --git a/po/it.po b/po/it.po
index 9c08c5fc..fbdc4684 100644
--- a/po/it.po
+++ b/po/it.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Decorazioni"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Sempre sopra"
 
 #: src/menu/menu.c:662
diff --git a/po/ka.po b/po/ka.po
index 7cdde913..7bb432d8 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -43,7 +43,7 @@ msgid "Decorations"
 msgstr "დეკორაციები"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "ყოველთვისყველაზეზემოდან"
 
 #: src/menu/menu.c:662
diff --git a/po/labwc.pot b/po/labwc.pot
index a9d90fa4..eff1d14e 100644
--- a/po/labwc.pot
+++ b/po/labwc.pot
@@ -42,25 +42,25 @@ msgid "Decorations"
 msgstr ""
 
 #: src/menu/menu.c:724
-msgid "AlwaysOnTop"
+msgid "Always on Top"
 msgstr ""
 
-#: src/menu/menu.c:726
-msgid "ToggleOmnipresent"
-msgstr ""
-
-#: src/menu/menu.c:731
+#: src/menu/menu.c:729
 msgid "Move left"
 msgstr ""
 
-#: src/menu/menu.c:738
+#: src/menu/menu.c:736
 msgid "Move right"
 msgstr ""
 
 #: src/menu/menu.c:741
-msgid "Workspace"
+msgid "Always on Visible Workspace"
 msgstr ""
 
 #: src/menu/menu.c:744
+msgid "Workspace"
+msgstr ""
+
+#: src/menu/menu.c:747
 msgid "Close"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 7ba83023..dee75e1d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Dekoracje"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Zawsze na wierzchu"
 
 #: src/menu/menu.c:662
diff --git a/po/ru.po b/po/ru.po
index 4781cbf4..4bc18c6f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -42,7 +42,7 @@ msgid "Decorations"
 msgstr "Декорации"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Всегда на переднем плане"
 
 #: src/menu/menu.c:662
diff --git a/po/sv.po b/po/sv.po
index 4858e092..bd49c537 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -17,46 +17,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/menu/menu.c:631
+#: src/menu/menu.c:698
 msgid "Reconfigure"
 msgstr "Konfigurera om"
 
-#: src/menu/menu.c:633
+#: src/menu/menu.c:700
 msgid "Exit"
-msgstr "Utgång"
+msgstr "Avsluta"
 
-#: src/menu/menu.c:649
+#: src/menu/menu.c:716
 msgid "Minimize"
 msgstr "Minimera"
 
-#: src/menu/menu.c:651
+#: src/menu/menu.c:718
 msgid "Maximize"
 msgstr "Maximera"
 
-#: src/menu/menu.c:653
+#: src/menu/menu.c:720
 msgid "Fullscreen"
 msgstr "Fullskärm"
 
-#: src/menu/menu.c:655
+#: src/menu/menu.c:722
 msgid "Decorations"
 msgstr "Dekorationer"
 
-#: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+#: src/menu/menu.c:724
+msgid "Always on Top"
 msgstr "Alltid överst"
 
-#: src/menu/menu.c:662
+#: src/menu/menu.c:729
 msgid "Move left"
 msgstr "Flytta till vänster"
 
-#: src/menu/menu.c:667
+#: src/menu/menu.c:736
 msgid "Move right"
 msgstr "Flytta till höger"
 
-#: src/menu/menu.c:672
+#: src/menu/menu.c:741
+msgid "Always on Visible Workspace"
+msgstr "Alltid på aktiv arbetsyta"
+
+#: src/menu/menu.c:744
 msgid "Workspace"
 msgstr "Arbetsyta"
 
-#: src/menu/menu.c:675
+#: src/menu/menu.c:747
 msgid "Close"
 msgstr "Stäng"
diff --git a/po/tr.po b/po/tr.po
index cbdb0caf..2e63d526 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -41,7 +41,7 @@ msgid "Decorations"
 msgstr "Süslemeler"
 
 #: src/menu/menu.c:657
-msgid "AlwaysOnTop"
+msgid "Always On Top"
 msgstr "Her zaman üstte"
 
 #: src/menu/menu.c:662
diff --git a/src/menu/menu.c b/src/menu/menu.c
index 35f00b9f..b2ee0857 100644
--- a/src/menu/menu.c
+++ b/src/menu/menu.c
@@ -721,10 +721,8 @@ init_windowmenu(struct server *server)
 		fill_item("name.action", "ToggleFullscreen");
 		current_item = item_create(menu, _("Decorations"), false);
 		fill_item("name.action", "ToggleDecorations");
-		current_item = item_create(menu, _("AlwaysOnTop"), false);
+		current_item = item_create(menu, _("Always on Top"), false);
 		fill_item("name.action", "ToggleAlwaysOnTop");
-		current_item = item_create(menu, _("ToggleOmnipresent"), false);
-		fill_item("name.action", "ToggleOmnipresent");
 
 		/* Workspace sub-menu */
 		struct menu *workspace_menu = menu_create(server, "workspaces", "");
@@ -738,6 +736,11 @@ init_windowmenu(struct server *server)
 		current_item = item_create(workspace_menu, _("Move right"), false);
 		fill_item("name.action", "SendToDesktop");
 		fill_item("to.action", "right");
+		current_item = separator_create(workspace_menu, "");
+		current_item = item_create(workspace_menu,
+			_("Always on Visible Workspace"), false);
+		fill_item("name.action", "ToggleOmnipresent");
+
 		current_item = item_create(menu, _("Workspace"), true);
 		current_item->submenu = workspace_menu;