diff --git a/extensions/irc/xul/content/menus.js b/extensions/irc/xul/content/menus.js
index 78b6c0227e5d..3def51a8f5a3 100644
--- a/extensions/irc/xul/content/menus.js
+++ b/extensions/irc/xul/content/menus.js
@@ -399,9 +399,12 @@ function initMenus()
          ["nick"],
          ["-"],
          ["back", {type: "checkbox", checkedif: net + " and !" + netAway}],
-         ["away", {type: "checkbox", checkedif: net + " and " + netAwayIsDef}],
-         ["custom-away",
-                  {type: "checkbox", checkedif: net + " and !" + netAwayIsDef}]
+         ["away", {type: "checkbox",
+                     checkedif: "cx.sourceObject.prefs.away == item.message",
+                     repeatfor: "client.awayMsgs",
+                     repeatmap: "cx.reason = item.message" }],
+         ["-"],
+         ["custom-away"]
         ]
     };