diff --git a/mozilla/extensions/irc/xul/content/menus.js b/mozilla/extensions/irc/xul/content/menus.js
index 3def51a8f5a..bb4f1339662 100644
--- a/mozilla/extensions/irc/xul/content/menus.js
+++ b/mozilla/extensions/irc/xul/content/menus.js
@@ -387,8 +387,7 @@ function initMenus()
 
     var net          = "cx.network";
     var netAway      = "cx.network.prefs['away']";
-    var netAwayIsDef = "(cx.network.prefs['away'] == '" + MSG_AWAY_DEFAULT +
-                       "') and " + netAway;
+    var awayChecked = "cx.network and (cx.network.prefs.away == item.message)";
 
     client.menuSpecs["mainmenu:nickname"] = {
         label: client.prefs["nickname"],
@@ -400,7 +399,7 @@ function initMenus()
          ["-"],
          ["back", {type: "checkbox", checkedif: net + " and !" + netAway}],
          ["away", {type: "checkbox",
-                     checkedif: "cx.sourceObject.prefs.away == item.message",
+                     checkedif: awayChecked,
                      repeatfor: "client.awayMsgs",
                      repeatmap: "cx.reason = item.message" }],
          ["-"],