5 files changed, 7 insertions, 39 deletions
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index 01e0c3e00..b501962fb 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -244,15 +244,6 @@ bool ArcTool::root_handler(GdkEvent* event) {
                     }
                     break;
 
-                case GDK_KEY_Up:
-                case GDK_KEY_Down:
-                case GDK_KEY_KP_Up:
-                case GDK_KEY_KP_Down:
-                    // prevent the zoom field from activation
-                    if (!MOD__CTRL_ONLY(event))
-                        handled = true;
-                    break;
-
                 case GDK_KEY_x:
                 case GDK_KEY_X:
                     if (MOD__ALT_ONLY(event)) {
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index 8eaae2f7b..9ebf51e76 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -274,15 +274,6 @@ bool RectTool::root_handler(GdkEvent* event) {
                                             NULL);
             }
             break;
-        case GDK_KEY_Up:
-        case GDK_KEY_Down:
-        case GDK_KEY_KP_Up:
-        case GDK_KEY_KP_Down:
-            // prevent the zoom field from activation
-            if (!MOD__CTRL_ONLY(event))
-                ret = TRUE;
-            break;
-
         case GDK_KEY_x:
         case GDK_KEY_X:
             if (MOD__ALT_ONLY(event)) {
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 08c35b9b0..b681aec38 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -245,14 +245,6 @@ bool SpiralTool::root_handler(GdkEvent* event) {
                                                NULL,
                                                _("<b>Alt</b>: lock spiral radius"));
                     break;
-                case GDK_KEY_Up:
-                case GDK_KEY_Down:
-                case GDK_KEY_KP_Up:
-                case GDK_KEY_KP_Down:
-                    // prevent the zoom field from activation
-                    if (!MOD__CTRL_ONLY(event))
-                        ret = TRUE;
-                    break;
 
                 case GDK_KEY_x:
                 case GDK_KEY_X:
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 18992d87a..32f0e6d92 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -260,15 +260,6 @@ bool StarTool::root_handler(GdkEvent* event) {
                                        NULL);
             break;
 
-        case GDK_KEY_Up:
-        case GDK_KEY_Down:
-        case GDK_KEY_KP_Up:
-        case GDK_KEY_KP_Down:
-            // prevent the zoom field from activation
-            if (!MOD__CTRL_ONLY(event))
-                ret = TRUE;
-            break;
-
         case GDK_KEY_x:
         case GDK_KEY_X:
             if (MOD__ALT_ONLY(event)) {
diff --git a/src/ui/tools/tool-base.cpp b/src/ui/tools/tool-base.cpp
index ddd7c19c4..457d704aa 100644
--- a/src/ui/tools/tool-base.cpp
+++ b/src/ui/tools/tool-base.cpp
@@ -328,13 +328,16 @@ bool ToolBase::_keyboardMove(GdkEventKey const &event, Geom::Point const &dir)
         if (knotholder) {
             knotholder->transform_selected(Geom::Translate(delta));
         }
-    } else {
+    } else if (tools_isactive(desktop, TOOLS_NODES)) {
         Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(desktop->event_context);
         if (nt) {
             for(auto i=nt->_shape_editors.begin();i!=nt->_shape_editors.end();++i){
-                KnotHolder * knotholder = i->second->knotholder;
-                if (knotholder) {
-                    knotholder->transform_selected(Geom::Translate(delta));
+                ShapeEditor * shape_editor = i->second;
+                if (shape_editor && shape_editor->has_knotholder()) {
+                    KnotHolder * knotholder = shape_editor->knotholder;
+                    if (knotholder) {
+                        knotholder->transform_selected(Geom::Translate(delta));
+                    }
                 }
             }
         }