1 files changed, 5 insertions, 3 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index a5c6ae961..4dfb4597d 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -118,10 +118,12 @@ void SelectionHelper::selectAll(SPDesktop *dt)
 {
     if (tools_isactive(dt, TOOLS_NODES)) {
         InkNodeTool *nt = static_cast<InkNodeTool*>(dt->event_context);
-        nt->_multipath->selectSubpaths();
-    } else {
-        sp_edit_select_all(dt);
+        if (!nt->_multipath->empty()) {
+            nt->_multipath->selectSubpaths();
+            return;
+        }
     }
+    sp_edit_select_all(dt);
 }
 
 void SelectionHelper::selectAllInAll(SPDesktop *dt)