diff --git a/js/Keyboard.js b/js/Keyboard.js
index e9522a5..92ab870 100644
--- a/js/Keyboard.js
+++ b/js/Keyboard.js
@@ -5,6 +5,7 @@ function initKeyboard() {
 	$(document).keypress(function(event) {
 
 		if (!keyboardShortcutsEnabled) return;
+		if (event.altKey || event.ctrlKey || event.metaKey) return; //ignore key presses with modifier keys except shift
 
 		var ch = String.fromCharCode(event.which);
 
diff --git a/js/buttonbehaviors.js b/js/buttonbehaviors.js
index d43a851..eb9d01b 100644
--- a/js/buttonbehaviors.js
+++ b/js/buttonbehaviors.js
@@ -135,7 +135,7 @@ function initButtonBehavior() {
 	function onBtnRotate(e,cursor) {
 		var h = btnZoom.height();
 		var multiplier = (h/2-cursor.y)*0.003;
-		rotateShape(multiplier);
+		rotateShape(-multiplier);
 		//if (cursor.y<25) rotateShape(.1);
 		//else if (cursor.y>55) rotateShape(-.1); 
 	}