diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py
index cd9ee03fb..e29070aaf 100644
--- a/qutebrowser/keyinput/modeman.py
+++ b/qutebrowser/keyinput/modeman.py
@@ -150,7 +150,7 @@ class ModeManager(QObject):
         self._win_id = win_id
         self._handlers = {}
         self.passthrough = []
-        self.mode = usertypes.KeyMode.none
+        self.mode = usertypes.KeyMode.normal
         self._releaseevents_to_pass = []
         self._forward_unbound_keys = config.get(
             'input', 'forward-unbound-keys')
diff --git a/qutebrowser/mainwindow/mainwindow.py b/qutebrowser/mainwindow/mainwindow.py
index c5a0b00a9..f991c55f1 100644
--- a/qutebrowser/mainwindow/mainwindow.py
+++ b/qutebrowser/mainwindow/mainwindow.py
@@ -22,7 +22,6 @@
 import binascii
 import base64
 import itertools
-import functools
 
 from PyQt5.QtCore import pyqtSlot, QRect, QPoint, QTimer, Qt
 from PyQt5.QtWidgets import QWidget, QVBoxLayout
@@ -112,8 +111,6 @@ class MainWindow(QWidget):
         modeman.init(self.win_id, self)
 
         self._connect_signals()
-        QTimer.singleShot(0, functools.partial(
-            modeman.enter, win_id, usertypes.KeyMode.normal, 'init'))
 
         # When we're here the statusbar might not even really exist yet, so
         # resizing will fail. Therefore, we use singleShot QTimers to make sure
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py
index 02a925cd3..9759a3189 100644
--- a/qutebrowser/utils/usertypes.py
+++ b/qutebrowser/utils/usertypes.py
@@ -230,8 +230,8 @@ ClickTarget = enum('ClickTarget', ['normal', 'tab', 'tab_bg', 'window'])
 
 
 # Key input modes
-KeyMode = enum('KeyMode', ['none', 'normal', 'hint', 'command', 'yesno',
-                           'prompt', 'insert', 'passthrough'])
+KeyMode = enum('KeyMode', ['normal', 'hint', 'command', 'yesno', 'prompt',
+                           'insert', 'passthrough'])
 
 
 # Available command completions