diff --git a/Vocaluxe/Base/CGraphics.cs b/Vocaluxe/Base/CGraphics.cs
index 837cd713..eb53d99a 100644
--- a/Vocaluxe/Base/CGraphics.cs
+++ b/Vocaluxe/Base/CGraphics.cs
@@ -348,8 +348,7 @@ namespace Vocaluxe.Base
                 if (!eventsAvailable)
                     keyEvent = inputKeyEvent;
 
-                if (keyEvent.Key == Keys.Left || keyEvent.Key == Keys.Right || keyEvent.Key == Keys.Up || keyEvent.Key == Keys.Down || keyEvent.Key == Keys.NumPad0 ||
-                    keyEvent.Key == Keys.D0)
+                if (keyEvent.IsArrowKey() || keyEvent.Key == Keys.NumPad0 || keyEvent.Key == Keys.D0)
                 {
                     _Cursor.Deactivate();
 
diff --git a/Vocaluxe/Screens/CPopupScreenServerQR.cs b/Vocaluxe/Screens/CPopupScreenServerQR.cs
index a961edd9..febb08a2 100644
--- a/Vocaluxe/Screens/CPopupScreenServerQR.cs
+++ b/Vocaluxe/Screens/CPopupScreenServerQR.cs
@@ -15,6 +15,7 @@
 // along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
 #endregion
 
+using System.Windows.Forms;
 using Vocaluxe.Base;
 using Vocaluxe.Base.Server;
 using VocaluxeLib;
@@ -75,7 +76,7 @@ namespace Vocaluxe.Screens
 
         public override bool HandleMouse(SMouseEvent mouseEvent)
         {
-            if (mouseEvent.LB)
+            if (mouseEvent.LB || mouseEvent.RB)
             {
                 CGraphics.HidePopup(EPopupScreens.PopupServerQR);
                 return true;
@@ -83,6 +84,18 @@ namespace Vocaluxe.Screens
             return false;
         }
 
+        public override bool HandleInput(SKeyEvent keyEvent)
+        {
+            switch (keyEvent.Key)
+            {
+                case Keys.Escape:
+                case Keys.Back:
+                    CGraphics.HidePopup(EPopupScreens.PopupServerQR);
+                    return true;
+            }
+            return base.HandleInput(keyEvent);
+        }
+
         public override bool UpdateGame()
         {
             return true;