diff --git a/res/layouts/console.xml b/res/layouts/console.xml
index 1764e93a..bbe869d0 100644
--- a/res/layouts/console.xml
+++ b/res/layouts/console.xml
@@ -11,5 +11,12 @@
             gravity="bottom-left"
         ></textbox>
     </container>
-    <textbox id='prompt' consumer='submit' margin='0' gravity='bottom-left' size-func="gui.get_viewport()[1],40"></textbox>
+    <textbox id='prompt' 
+             consumer='submit' 
+             margin='0' 
+             gravity='bottom-left' 
+             size-func="gui.get_viewport()[1],40"
+             onup="on_history_up()"
+             ondown="on_history_down()">
+    </textbox>
 </container>
diff --git a/res/layouts/console.xml.lua b/res/layouts/console.xml.lua
index 41d75430..3e5b0f70 100644
--- a/res/layouts/console.xml.lua
+++ b/res/layouts/console.xml.lua
@@ -1,3 +1,6 @@
+history = session.get_entry("console_history")
+history_pointer = #history
+
 function setup_variables()
     local x,y,z = player.get_pos(hud.get_player())
     console.set('pos.x', x)
@@ -5,7 +8,29 @@ function setup_variables()
     console.set('pos.z', z)
 end
 
+function on_history_up()
+    if history_pointer == 0 then
+        return
+    end
+    document.prompt.text = history[history_pointer]
+    history_pointer = history_pointer - 1
+end
+
+function on_history_down()
+    if history_pointer == #history-1 then
+        return
+    end
+    history_pointer = history_pointer + 1
+    document.prompt.text = history[history_pointer + 1]
+end
+
+function add_to_history(text)
+    table.insert(history, text)
+    history_pointer = #history
+end
+
 function submit(text)
+    add_to_history(text)
     setup_variables()
     
     local status, result = pcall(function() return console.execute(text) end)