diff --git a/vim/segments/core.py b/vim/segments/core.py
index 60d98046..e5586d96 100644
--- a/vim/segments/core.py
+++ b/vim/segments/core.py
@@ -47,10 +47,13 @@ def mode(override=None):
 	'''
 	mode = vim_funcs['mode']()
 
+	if not override:
+		return (mode, vim_modes[mode])
+
 	try:
-		return override[mode]
-	except TypeError:
-		return vim_modes[mode]
+		return (mode, override[mode])
+	except IndexError:
+		return (mode, vim_modes[mode])
 
 
 def modified_indicator(text=u'+'):