diff --git a/Echo.ahk b/Echo.ahk
index 68acd47..a68e477 100644
--- a/Echo.ahk
+++ b/Echo.ahk
@@ -5,6 +5,7 @@ SetWorkingDir %A_ScriptDir%
 #SingleInstance force
 #Persistent
 
+SetBatchLines, -1
 SetKeyDelay, -1, 100
 SetControlDelay, 500
 
@@ -308,15 +309,20 @@ F5::
     ih.Start()
 return
 
-F3::
-    MakeUI()
-return
+; F3::
+;     MakeUI()
+; return
 
-^!A::
+F3::
     ShowTooltip("Adding key")
     addNext := 1
 return
 
+F4::
+    ShowTooltip("Removing key")
+    removeNext := 1
+return
+
 ^!S::
     ShowTooltip("Adding window")
     AddCurrentWindow()
@@ -325,12 +331,7 @@ return
 ^!D::
     ShowTooltip("Removing window")
     RemoveCurrentWindow()
-return
-
-^!R::
-    ShowTooltip("Removing key")
-    removeNext := 1
-return
+WantReturn
 
 F4::
     WhitelistButtonUI()