diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 4c11e91cf..57c95c8f3 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -55,6 +55,11 @@ Changed
 - Make qute:// pages work properly on Qt 5.11.2
 - The `content.autoplay` setting now supports URL patterns on Qt >= 5.11.
 
+Fixed
+~~~~~
+
+- Error when passing a substring with spaces to `:tab-take`.
+
 Removed
 ~~~~~~~
 
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 441e88dbc..8dbb661e5 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -485,7 +485,8 @@ class CommandDispatcher:
         new_tabbed_browser.widget.set_tab_pinned(newtab, curtab.data.pinned)
         return newtab
 
-    @cmdutils.register(instance='command-dispatcher', scope='window')
+    @cmdutils.register(instance='command-dispatcher', scope='window',
+                       maxsplit=0)
     @cmdutils.argument('index', completion=miscmodels.other_buffer)
     def tab_take(self, index):
         """Take a tab from another window.