diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index fe9e34d96..63f179467 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -27,6 +27,8 @@ Deprecated
   driver was dropped. Newer Qt 5.12.x versions are still fully supported.
 - The `--force` argument for `:tab-only` is deprecated, use `--pinned close`
   instead.
+- Using `:tab-focus` without an argument or count is now deprecated, use
+  `:tab-next` instead.
 
 Added
 ~~~~~
@@ -82,6 +84,9 @@ Changed
 - When an external file selector is used, some additional validation is done on
   the picked files now, so that errors are shown if e.g. a directory is selected
   when a file was expected.
+- The default binding for `T` (`:tab-focus`) got changed so that it fills the
+  command line with `:tab-focus` if used without a count (instead of being
+  equivalent to `:tab-next` in that case).
 
 Fixed
 ~~~~~
diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index ad6ec6ff1..f02b9bc96 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -624,7 +624,7 @@ Default:
 * +pass:[Sh]+: +pass:[history]+
 * +pass:[Sq]+: +pass:[bookmark-list]+
 * +pass:[Ss]+: +pass:[set]+
-* +pass:[T]+: +pass:[tab-focus]+
+* +pass:[T]+: +pass:[set-cmd-text -sr :tab-focus]+
 * +pass:[U]+: +pass:[undo -w]+
 * +pass:[V]+: +pass:[mode-enter caret ;; selection-toggle --line]+
 * +pass:[ZQ]+: +pass:[quit]+
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 87c8113f0..cfed87f58 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -983,6 +983,9 @@ class CommandDispatcher:
             self._tab_focus_stack(index)
             return
         elif index is None:
+            message.warning(
+                "Using :tab-focus without count is deprecated, "
+                "use :tab-next instead.")
             self.tab_next()
             return
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index 1d6d15c46..8b233e018 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -3336,7 +3336,7 @@ bindings.default:
       <Ctrl-Shift-W>: close
       D: tab-close -o
       co: tab-only
-      T: tab-focus
+      T: set-cmd-text -sr :tab-focus
       gm: tab-move
       gK: tab-move -
       gJ: tab-move +
diff --git a/tests/end2end/features/tabs.feature b/tests/end2end/features/tabs.feature
index a1cccf261..e8fc9e7bc 100644
--- a/tests/end2end/features/tabs.feature
+++ b/tests/end2end/features/tabs.feature
@@ -192,7 +192,8 @@ Feature: Tab management
         And I open data/numbers/3.txt in a new tab
         And I run :tab-focus 2
         And I run :tab-focus
-        Then the following tabs should be open:
+        Then the warning "Using :tab-focus without count is deprecated, use :tab-next instead." should be shown
+        And the following tabs should be open:
             - data/numbers/1.txt
             - data/numbers/2.txt
             - data/numbers/3.txt (active)