diff --git a/public/red/ui/keyboard.js b/public/red/ui/keyboard.js
index 36285e859..25103ea88 100644
--- a/public/red/ui/keyboard.js
+++ b/public/red/ui/keyboard.js
@@ -21,23 +21,36 @@ RED.keyboard = function() {
     d3.select(window).on("keydown",function() {
         if (!active) { return; }
         var handler = handlers[d3.event.keyCode];
-        if (handler) {
+        if (handler && handler.ondown) {
             if (!handler.modifiers ||
                 ((!handler.modifiers.shift || d3.event.shiftKey)&&
                     (!handler.modifiers.ctrl || d3.event.ctrlKey))) {
-                handler.callback();
+                handler.ondown();
             }
         }
     });
-    
-    function addHandler(key,modifiers,callback) {
+    d3.select(window).on("keyup",function() {
+        if (!active) { return; }
+        var handler = handlers[d3.event.keyCode];
+        if (handler && handler.onup) {
+            if (!handler.modifiers ||
+                ((!handler.modifiers.shift || d3.event.shiftKey)&&
+                    (!handler.modifiers.ctrl || d3.event.ctrlKey))) {
+                handler.onup();
+            }
+        }
+    });
+    function addHandler(key,modifiers,ondown,onup) {
         var mod = modifiers;
-        var cb = callback;
+        var cbdown = ondown;
+        var cbup = onup;
+        
         if (typeof modifiers == "function") {
             mod = {};
-            cb = modifiers;
+            cbdown = modifiers;
+            cbup = ondown;
         }
-        handlers[key] = {modifiers:mod, callback:cb};
+        handlers[key] = {modifiers:mod, ondown:cbdown, onup:cbup};
     }
     function removeHandler(key) {
         delete handlers[key];
diff --git a/public/red/ui/view.js b/public/red/ui/view.js
index d6da19d6a..1f687250d 100644
--- a/public/red/ui/view.js
+++ b/public/red/ui/view.js
@@ -398,6 +398,12 @@ RED.view = function() {
                 RED.history.push({t:'move',nodes:ns,dirty:dirty});
             }
         }
+        if (mouse_mode == RED.state.MOVING || mouse_mode == RED.state.MOVING_ACTIVE) {
+            for (var i=0;i<moving_set.length;i++) {
+                delete moving_set[i].ox;
+                delete moving_set[i].oy;
+            }
+        }
         if (mouse_mode == RED.state.IMPORT_DRAGGING) {
             RED.keyboard.remove(/* ESCAPE */ 27);
             setDirty(true);
@@ -526,13 +532,59 @@ RED.view = function() {
             RED.keyboard.add(/* c */ 67,{ctrl:true},function(){copySelection();d3.event.preventDefault();});
             RED.keyboard.add(/* x */ 88,{ctrl:true},function(){copySelection();deleteSelection();d3.event.preventDefault();});
         }
+        if (moving_set.length == 0) {
+            RED.keyboard.remove(/* up   */ 38);
+            RED.keyboard.remove(/* down */ 40);
+            RED.keyboard.remove(/* left */ 37);
+            RED.keyboard.remove(/* right*/ 39);
+        } else {
+            RED.keyboard.add(/* up   */ 38, function() { d3.event.shiftKey?moveSelection(  0,-20):moveSelection( 0,-1);d3.event.preventDefault();},endKeyboardMove);
+            RED.keyboard.add(/* down */ 40, function() { d3.event.shiftKey?moveSelection(  0, 20):moveSelection( 0, 1);d3.event.preventDefault();},endKeyboardMove);
+            RED.keyboard.add(/* left */ 37, function() { d3.event.shiftKey?moveSelection(-20,  0):moveSelection(-1, 0);d3.event.preventDefault();},endKeyboardMove);
+            RED.keyboard.add(/* right*/ 39, function() { d3.event.shiftKey?moveSelection( 20,  0):moveSelection( 1, 0);d3.event.preventDefault();},endKeyboardMove);
+        }
         if (moving_set.length == 1) {
             RED.sidebar.info.refresh(moving_set[0].n);
         } else {
             RED.sidebar.info.clear();
         }
     }
-
+    function endKeyboardMove() {
+        var ns = [];
+        for (var i=0;i<moving_set.length;i++) {
+            ns.push({n:moving_set[i].n,ox:moving_set[i].ox,oy:moving_set[i].oy});
+            delete moving_set[i].ox;
+            delete moving_set[i].oy;
+        }
+        RED.history.push({t:'move',nodes:ns,dirty:dirty});
+    }
+    function moveSelection(dx,dy) {
+        var minX = 0;
+        var minY = 0;
+        
+        for (var i=0;i<moving_set.length;i++) {
+            var node = moving_set[i];
+            if (node.ox == null && node.oy == null) {
+                node.ox = node.n.x;
+                node.oy = node.n.y;
+            }
+            node.n.x += dx;
+            node.n.y += dy;
+            node.n.dirty = true;
+            minX = Math.min(node.n.x-node.n.w/2-5,minX);
+            minY = Math.min(node.n.y-node.n.h/2-5,minY);
+        }
+        
+        if (minX != 0 || minY != 0) {
+            for (var n = 0; n<moving_set.length; n++) {
+                var node = moving_set[n];
+                node.n.x -= minX;
+                node.n.y -= minY;
+            }
+        }
+        
+        redraw();
+    }
     function deleteSelection() {
         var removedNodes = [];
         var removedLinks = [];
@@ -1263,6 +1315,9 @@ RED.view = function() {
         getWorkspace: function() {
             return activeWorkspace;
         },
+        showWorkspace: function(id) {
+            workspace_tabs.activateTab(id);
+        },
         redraw:redraw,
         dirty: function(d) {
             if (d == null) {