diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -7,8 +7,9 @@ 8d4bc132f2523993a7d9c5a01cb94ef1048591b9
 0b5f5c3d666be70d5a1fc9aea562d39adf8fa181 CHATZILLA_0_9_88_1_RELEASE
 7a5400416482ab079fd0073dafa0a5b0382d7eaf CHATZILLA_0_9_88_2_RELEASE
 fc5089117b1413b53ce57d201ed0005babbd3280 CHATZILLA_0_9_89_RELEASE
 7f32a1339f8c334b6d731ec4972faa7a412c1667 CHATZILLA_0_9_90_RELEASE
 22bcb0f2601112cf039e33f4faad9ce802a97b0e CHATZILLA_0_9_91_RELEASE
 b85ad0cda0507c587b1fc91872172c42b105876c CHATZILLA_0_9_91_1_RELEASE
 64c11fe5c5138ff2ca27578341840f645d21a783 SEA2_37_RELBRANCH
 21876a1c04b46d1c1e76f48a2015bced91afd7b7 CHATZILLA_0_9_92_RELEASE
+35ff2f0f2ad833481b3cdc35ac201c07b9508cff SEA2_42_RELBRANCH
diff --git a/xul/content/commands.js b/xul/content/commands.js
--- a/xul/content/commands.js
+++ b/xul/content/commands.js
@@ -3800,19 +3800,27 @@ function cmdDoCommand(e)
         const PREF_URL = 'chrome://chatzilla/content/pref-irc.xul';
         if (goPreferences.length == 1) // SeaMonkey 2.x
             goPreferences('navigator_pane');
         else // Mozilla, SeaMonkey 1.x, etc.
             goPreferences('navigator', PREF_URL, 'navigator');
     }
     else if (e.cmdName == "cmd_chatzillaPrefs")
     {
+        var prefWin = getWindowByType("irc:chatzilla:config");
+        if (!prefWin)
+        {
         window.openDialog('chrome://chatzilla/content/config.xul', '',
                           'chrome,resizable,dialog=no', window);
     }
+        else
+        {
+            prefWin.focus();
+        }
+    }
     else if (e.cmdName == "cmd_selectAll")
     {
         var userList = document.getElementById("user-list");
         var elemFocused = document.commandDispatcher.focusedElement;
 
         if (userList.view && (elemFocused == userList))
             userList.view.selection.selectAll();
         else