2 files changed, 6 insertions, 0 deletions
diff --git a/src/node-context.cpp b/src/node-context.cpp
index 1cac6f164..3d11aefe4 100644
--- a/src/node-context.cpp
+++ b/src/node-context.cpp
@@ -153,6 +153,8 @@ sp_node_context_setup(SPEventContext *ec)
         ec->enableGrDrag();
     }
 
+    ec->desktop->emitToolSubselectionChanged(NULL); // sets the coord entry fields to inactive
+
     nc->_node_message_context = new Inkscape::MessageContext((ec->desktop)->messageStack());
 
     nc->shape_editor->update_statusbar();
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 43124a79e..c2c7ff852 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -904,6 +904,10 @@ sp_node_toolbox_coord_changed(gpointer /*shape_editor*/, GObject *tbl)
                 }
             }
         }
+    } else {
+        // no shape-editor or nodepath yet (when we just switched to the tool); coord entries must be inactive
+        gtk_action_set_sensitive(xact, FALSE);
+        gtk_action_set_sensitive(yact, FALSE);
     }
 
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );