diff --git a/Sources/arm/ui/UIFiles.hx b/Sources/arm/ui/UIFiles.hx
index 1dc90bdc..4f3d81c1 100644
--- a/Sources/arm/ui/UIFiles.hx
+++ b/Sources/arm/ui/UIFiles.hx
@@ -62,9 +62,12 @@ class UIFiles {
 
 	static function releaseKeys() {
 		// File dialog may prevent firing key up events
-		var kb = Input.getKeyboard();
-		@:privateAccess kb.upListener(kha.input.KeyCode.Shift);
-		@:privateAccess kb.upListener(kha.input.KeyCode.Control);
+		var kb = kha.input.Keyboard.get();
+		@:privateAccess kb.sendUpEvent(kha.input.KeyCode.Shift);
+		@:privateAccess kb.sendUpEvent(kha.input.KeyCode.Control);
+		#if krom_darwin
+		@:privateAccess kb.sendUpEvent(kha.input.KeyCode.Meta);
+		#end
 	}
 
 	@:access(zui.Zui)
diff --git a/Sources/arm/ui/UISidebar.hx b/Sources/arm/ui/UISidebar.hx
index cdce5bcf..b380a2ad 100644
--- a/Sources/arm/ui/UISidebar.hx
+++ b/Sources/arm/ui/UISidebar.hx
@@ -639,14 +639,9 @@ class UISidebar {
 			hwnd.redraws = 2;
 		}
 
-		#if krom_darwin
-		var undoPressed = !kb.down("shift") && kb.started("z"); // cmd+z on macos
-		var redoPressed = (kb.down("shift") && kb.started("z")) || kb.started("y"); // cmd+y on macos
-		#else
 		var undoPressed = Operator.shortcut(Config.keymap.edit_undo);
 		var redoPressed = Operator.shortcut(Config.keymap.edit_redo) ||
 						  (kb.down("control") && kb.started("y"));
-		#end
 
 		if (undoPressed) History.undo();
 		else if (redoPressed) History.redo();
diff --git a/Sources/arm/ui/UIView2D.hx b/Sources/arm/ui/UIView2D.hx
index 20582206..46fbbf5c 100644
--- a/Sources/arm/ui/UIView2D.hx
+++ b/Sources/arm/ui/UIView2D.hx
@@ -267,7 +267,7 @@ class UIView2D {
 			return;
 		}
 
-		if (mouse.down("right") || mouse.down("middle") || (mouse.down("left") && kb.down("alt"))) {
+		if (mouse.down("right") || mouse.down("middle") || (mouse.down("left") && kb.down("ctrl"))) {
 			panX += mouse.movementX;
 			panY += mouse.movementY;
 		}