--- EFI3M.prev	2018-07-09 18:48:12.601173815 +0200
+++ EFI3M	2018-07-09 18:56:52.561202000 +0200
@@ -20,7 +20,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated on Mon, 09 Jul 2018 11:58:56 +0200
+# Updated on Mon, 09 Jul 2018 18:49:06 +0200
 # TODO (maybe):
 # Add as "super-fallback" /EFI/startup.nsh if absent?
 # Internationalize.
@@ -962,8 +962,6 @@
 }
 
 change_the_boot_order_unused_variant() {
-	# If we switch to this variant unset C1 and C2 in move_down and
-	# move_up are useless.
 	MOVE=""
 	NEWMENU=$TMP/NEWMENU
 	MENU="$1"
@@ -1000,8 +998,8 @@
 			read -p "Press Enter to continue. " dummy
 			continue
 		fi
+		clear
 		while [ 0 ]; do
-			clear
 			echo "Current menu:"
 			while read LINENUMBER name uuid path label; do
 				if [ $LINENUMBER -eq $NUMBER ]; then
@@ -1028,8 +1026,8 @@
 				stty $previous_tty_settings
 				case $KEY in
 					"") break 2 ;;
-					) [ $NUMBER -gt 1 ] && move_up ;;
-					) [ $NUMBER -lt $MAXLINENUMBER ] && move_down ;;
+					) [ $NUMBER -gt 1 ] && clear && move_up ;;
+					) [ $NUMBER -lt $MAXLINENUMBER ] && clear && move_down ;;
 					*)
 				esac
 			done
@@ -1074,8 +1072,8 @@
 			read -p "Press Enter to continue. " dummy
 			continue
 		fi
+		clear
 		while [ 0 ]; do
-			clear
 			echo "Current menu:"
 			while read LINENUMBER name uuid path label; do
 				if [ $LINENUMBER -eq $NUMBER ]; then
@@ -1107,8 +1105,8 @@
 					B) [ "$C2" = "[" ] && MOVE=down ;;
 					*) ;;
 				esac
-				[ "$MOVE" = "down" ] && [ $NUMBER -lt $MAXLINENUMBER ] && move_down
-				[ "$MOVE" = "up" ] && [ $NUMBER -gt 1 ] && move_up
+				[ "$MOVE" = "down" ] && [ $NUMBER -lt $MAXLINENUMBER ] && clear && move_down
+				[ "$MOVE" = "up" ] && [ $NUMBER -gt 1 ] && clear && move_up
 			done
 		done
 	done