diff --git a/lib/awful.lua.in b/lib/awful.lua.in
index 7ce832f81..b9da8d0b6 100644
--- a/lib/awful.lua.in
+++ b/lib/awful.lua.in
@@ -772,8 +772,9 @@ local function prompt_history_load()
                 if #prompt.history.data.table >= prompt.history.data.max then
                     break
                 end
-	    end
+            end
         end
+        prompt.history.data.index = #prompt.history.data.table + 1
     end
 end