diff --git a/common/content/tabs.js b/common/content/tabs.js
index 1acb38c7..0dffdc6b 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -798,7 +798,12 @@ var Tabs = Module("tabs", {
         if (config.has("tabbrowser")) {
             commands.add(["b[uffer]"],
                 "Switch to a buffer",
-                function (args) { tabs.switchTo(args[0], args.bang, args.count); }, {
+                function (args) {
+                    if (args.length)
+                        tabs.switchTo(args[0], args.bang, args.count);
+                    else if (args.count)
+                        tabs.switchTo(String(args.count));
+                }, {
                     argCount: "?",
                     bang: true,
                     count: true,
diff --git a/common/locale/en-US/tabs.xml b/common/locale/en-US/tabs.xml
index f4379266..35d32595 100644
--- a/common/locale/en-US/tabs.xml
+++ b/common/locale/en-US/tabs.xml
@@ -224,9 +224,9 @@
         <p>
             If argument is neither a full URL nor an index but uniquely identifies a
             buffer, by a partial match with the URL or title, it is selected.
-            With <oa>!</oa> the next buffer matching the argument is selected,
-            even if it cannot be identified uniquely. Use <k>b</k> as a
-            shortcut to open this prompt.
+            With <oa>!</oa> the next, or <oa>count</oa>th, buffer matching the
+            argument is selected, even if it cannot be identified uniquely. Use
+            <k>b</k> as a shortcut to open this prompt.
         </p>
 
         <p>If argument is <em>#</em>, the alternate buffer will be selected (see <k name="C-^"/>).</p>