diff --git a/app/components/mix-builder/precision-controls/track.js b/app/components/mix-builder/precision-controls/track.js
index b8311da4..66658199 100644
--- a/app/components/mix-builder/precision-controls/track.js
+++ b/app/components/mix-builder/precision-controls/track.js
@@ -17,13 +17,13 @@ const BEAT_JUMP_KEYBINDINGS = [
   },
   {
     key: 'KeyE',
-    beats: 4,
+    beats: 16,
     direction: -1,
     isFromTrackClip: true,
   },
   {
     key: 'shift+KeyE',
-    beats: 16,
+    beats: 32,
     direction: -1,
     isFromTrackClip: true,
   },
@@ -38,13 +38,13 @@ const BEAT_JUMP_KEYBINDINGS = [
   },
   {
     key: 'KeyR',
-    beats: 4,
+    beats: 16,
     direction: 1,
     isFromTrackClip: true,
   },
   {
     key: 'shift+KeyR',
-    beats: 16,
+    beats: 32,
     direction: 1,
     isFromTrackClip: true,
   },
@@ -58,12 +58,12 @@ const BEAT_JUMP_KEYBINDINGS = [
   },
   {
     key: 'KeyD',
-    beats: 4,
+    beats: 16,
     direction: -1,
   },
   {
     key: 'shift+KeyD',
-    beats: 16,
+    beats: 32,
     direction: -1,
   },
 
@@ -76,12 +76,12 @@ const BEAT_JUMP_KEYBINDINGS = [
   },
   {
     key: 'KeyF',
-    beats: 4,
+    beats: 16,
     direction: 1,
   },
   {
     key: 'shift+KeyF',
-    beats: 16,
+    beats: 32,
     direction: 1,
   },
 ];
@@ -152,11 +152,15 @@ export default Ember.Component.extend(
   },
 
   _moveFromTrack: Ember.on(keyDown('KeyW'), makeKeybinding(function(e) {
-    this.send('moveTransition');
+    if (this.get('isFromTrackClip')) {
+      this.send('moveTransition');
+    }
   })),
 
   _moveToTrack: Ember.on(keyDown('KeyS'), makeKeybinding(function(e) {
-    this.send('moveTransition');
+    if (this.get('isToTrackClip')) {
+      this.send('moveTransition');
+    }
   })),
 
   actions: {