diff --git a/src/modules/history_helper.c b/src/modules/history_helper.c
index 1e0cff2..5c84579 100644
--- a/src/modules/history_helper.c
+++ b/src/modules/history_helper.c
@@ -72,6 +72,7 @@ void historyEditAndExecute( void )
     char * nthElement = NULL;
 
     size_t queueSize = Queue_getSize( queuePtr );
+    clrscr();
 
     Queue_print_raw( queuePtr );
 
@@ -114,14 +115,6 @@ static void cursorHandler( size_t cursorYPosition, char * entryString )
     { 
         cursorYPosition--;
     }
-    else if ( entryLength > 39 && cursorYPosition == 23 )
-    {
-        cursorYPosition = 22;
-    }
-    else if ( entryLength > 36 && entryLength < 40 && cursorYPosition == 22 )
-    {
-        cursorYPosition = 23;
-    }
 
     while ( currentKey != 0x0a )
     {