diff --git a/ChangeLog b/ChangeLog
index 58dd30b1b..6bf687d54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-01-31  Elijah Newren  <newren@gmail.com>
+
+	Try 2 to correct misleading and inaccurate wording.  Hopefully,
+	really fixes #165380.
+
+	* src/menu.c: Change wording of menu to "Always on Current
+	Workspace" from "Put on All Workspaces", remove a quick-key
+	conflict between "On _Top" and "Only on _This Workspace" by
+	switching the latter to "_Only on This Workspace"
+
+	* src/window.c: Remove a comment that is no longer necessary
+	(since bug 87531 has been fixed)
+
 2005-01-31  Elijah Newren  <newren@gmail.com>
 
 	Correct the stacking when return from fullscreen mode.  Fixes
diff --git a/src/menu.c b/src/menu.c
index 61cc1d436..2d7031488 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -63,7 +63,7 @@ static MenuItem menuitems[] = {
   { 0, NULL, FALSE, NULL }, /* separator */
   { META_MENU_OP_DELETE, METACITY_STOCK_DELETE, FALSE, N_("_Close") },
   { META_MENU_OP_WORKSPACES, NULL, FALSE, NULL }, /* separator */
-  { META_MENU_OP_STICK, NULL, FALSE, N_("_Always on Current Workspace") },
+  { META_MENU_OP_STICK, NULL, FALSE, N_("_Always on Visible Workspace") },
   { META_MENU_OP_UNSTICK, NULL, FALSE,  N_("_Only on This Workspace") },
   { META_MENU_OP_MOVE_LEFT, NULL, FALSE, N_("Move to Workspace _Left") },
   { META_MENU_OP_MOVE_RIGHT, NULL, FALSE, N_("Move to Workspace R_ight") },