diff --git a/qutebrowser/browser/webkit/webpage.py b/qutebrowser/browser/webkit/webpage.py
index 5cc0aa3e9..7945a10e8 100644
--- a/qutebrowser/browser/webkit/webpage.py
+++ b/qutebrowser/browser/webkit/webpage.py
@@ -99,7 +99,8 @@ class BrowserPage(QWebPage):
                     config.get('content', 'ignore-javascript-prompt')):
                 return (False, "")
             answer = message.ask(self._win_id, 'Javascript prompt', msg,
-                                 usertypes.PromptMode.text, default=default,
+                                 mode=usertypes.PromptMode.text,
+                                 default=default,
                                  abort_on=[self.loadStarted,
                                            self.shutting_down])
             if answer is None:
@@ -451,7 +452,7 @@ class BrowserPage(QWebPage):
                 config.get('content', 'ignore-javascript-alert')):
             return
         message.ask(self._win_id, 'Javascript alert', msg,
-                    usertypes.PromptMode.alert,
+                    mode=usertypes.PromptMode.alert,
                     abort_on=[self.loadStarted, self.shutting_down])
 
     def javaScriptConfirm(self, frame, msg):
@@ -463,7 +464,7 @@ class BrowserPage(QWebPage):
         if self._is_shutting_down:
             return False
         ans = message.ask(self._win_id, 'Javascript confirm', msg,
-                          usertypes.PromptMode.yesno,
+                          mode=usertypes.PromptMode.yesno,
                           abort_on=[self.loadStarted, self.shutting_down])
         return bool(ans)
 
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index 37be132ce..c38ff1548 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -521,7 +521,7 @@ class MainWindow(QWidget):
         if quit_texts or 'always' in confirm_quit:
             text = '\n'.join(['Really quit?'] + quit_texts)
             confirmed = message.ask(self.win_id, text,
-                                    usertypes.PromptMode.yesno,
+                                    mode=usertypes.PromptMode.yesno,
                                     default=True)
             # Stop asking if the user cancels
             if not confirmed:
diff --git a/qutebrowser/utils/message.py b/qutebrowser/utils/message.py
index 7eacbc75d..60526578b 100644
--- a/qutebrowser/utils/message.py
+++ b/qutebrowser/utils/message.py
@@ -76,7 +76,7 @@ def info(message):
     global_bridge.show_message.emit(usertypes.MessageLevel.info, message)
 
 
-def _build_question(title, mode, *, default=None, text=None, abort_on=()):
+def _build_question(title, text=None, *, mode, default=None, abort_on=()):
     """Common function for ask/ask_async."""
     if not isinstance(mode, usertypes.PromptMode):
         raise TypeError("Mode {} is no PromptMode member!".format(mode))
@@ -123,7 +123,7 @@ def ask_async(win_id, text, mode, handler, **kwargs):
         default: The default value to display.
         text: Additional text to show.
     """
-    question = _build_question(text, mode, **kwargs)
+    question = _build_question(text, mode=mode, **kwargs)
     question.answered.connect(handler)
     question.completed.connect(question.deleteLater)
     bridge = objreg.get('message-bridge', scope='window', window=win_id)