diff --git a/client/ui/qml/Controls2/SwitcherType.qml b/client/ui/qml/Controls2/SwitcherType.qml
index 77b657e7..0651390f 100644
--- a/client/ui/qml/Controls2/SwitcherType.qml
+++ b/client/ui/qml/Controls2/SwitcherType.qml
@@ -158,23 +158,11 @@ Switch {
         enabled: false
     }
 
-    Keys.onEnterPressed: {
-        if (!event.isAutoRepeat) {
-            root.checked = !root.checked
-            root.checkedChanged()
-        }
-        event.accepted = true
-    }
+    Keys.onEnterPressed: event => handleSwitch(event)
+    Keys.onReturnPressed: event => handleSwitch(event)
+    Keys.onSpacePressed: event => handleSwitch(event)
 
-    Keys.onReturnPressed: {
-        if (!event.isAutoRepeat) {
-            root.checked = !root.checked
-            root.checkedChanged()
-        }
-        event.accepted = true
-    }
-
-    Keys.onSpacePressed: {
+    function handleSwitch(event) {
         if (!event.isAutoRepeat) {
             root.checked = !root.checked
             root.checkedChanged()