diff --git a/extensions/irc/xul/content/commands.js b/extensions/irc/xul/content/commands.js
index fa2a7842834..69851de78d5 100644
--- a/extensions/irc/xul/content/commands.js
+++ b/extensions/irc/xul/content/commands.js
@@ -2270,6 +2270,8 @@ function cmdNotify(e)
 
 function cmdStalk(e)
 {
+    var list = client.prefs["stalkWords"];
+
     if (!e.text)
     {
         if (list.length == 0)
@@ -2279,8 +2281,8 @@ function cmdStalk(e)
         return;
     }
 
-    client.prefs["stalkWords"].push(e.text);
-    client.prefs["stalkWords"].update();
+    list.push(e.text);
+    list.update();
 
     display(getMsg(MSG_STALK_ADD, e.text));
 }
@@ -2290,7 +2292,7 @@ function cmdUnstalk(e)
     e.text = e.text.toLowerCase();
     var list = client.prefs["stalkWords"];
 
-    for (i in list)
+    for (var i = 0; i < list.length; ++i)
     {
         if (list[i].toLowerCase() == e.text)
         {
diff --git a/extensions/irc/xul/locale/en-US/chatzilla.properties b/extensions/irc/xul/locale/en-US/chatzilla.properties
index 05efe1aa4ba..0e9e6677ccd 100644
--- a/extensions/irc/xul/locale/en-US/chatzilla.properties
+++ b/extensions/irc/xul/locale/en-US/chatzilla.properties
@@ -471,8 +471,8 @@ cmd.sslserver.help   = Connects to server using SSL <hostname> on <port>, or 999
 cmd.squery.params = <service> [<commands>]
 cmd.squery.help   = Sends the commands <commands> to the service <service>.
 
-cmd.stalk.params = <text>
-cmd.stalk.help   = Add text to list of words for which you would like to see alerts. Whenever a person with a nickname matching <text> speaks, or someone says a phrase containing <text>, your ChatZilla window will become active (on some operating systems) and its taskbar icon will flash (on some operating systems.)
+cmd.stalk.params = [<text>]
+cmd.stalk.help   = Add <text> to list of words for which you would like to see alerts. Whenever a person with a nickname matching <text> speaks, or someone says a phrase containing <text>, your ChatZilla window will become active (on some operating systems) and its taskbar icon will flash (on some operating systems.) If <text> is omitted the list of stalk words is displayed.
 
 cmd.status.help = Shows status information for the current view.