diff --git a/neo/framework/Console.cpp b/neo/framework/Console.cpp
index 4a86fe3e..33d3175a 100644
--- a/neo/framework/Console.cpp
+++ b/neo/framework/Console.cpp
@@ -642,6 +642,11 @@ void idConsoleLocal::KeyDownEvent( int key )
 		{
 			consoleField.SetBuffer( hist );
 		}
+		else // DG: if no more lines are in the history, show a blank line again
+		{
+			consoleField.Clear();
+		} // DG end
+		
 		return;
 	}
 	
@@ -1413,4 +1418,4 @@ void idConsoleLocal::DrawDebugGraphs()
 	{
 		debugGraphs[i]->Render( renderSystem );
 	}
-}
\ No newline at end of file
+}
diff --git a/neo/framework/ConsoleHistory.cpp b/neo/framework/ConsoleHistory.cpp
index f5d33b50..8fa4b703 100644
--- a/neo/framework/ConsoleHistory.cpp
+++ b/neo/framework/ConsoleHistory.cpp
@@ -131,6 +131,9 @@ idStr idConsoleHistory::RetrieveFromHistory( bool backward )
 	{
 		if( downPoint >= numHistory )
 		{
+			// DG: without this you'll get the last-but-one command when pressing UP
+			upPoint = downPoint - 1;
+			// DG end
 			return idStr( "" );
 		}
 		returnLine = downPoint;