diff --git a/src/Gui/DlgParameterFind.cpp b/src/Gui/DlgParameterFind.cpp
index fc931c5229..9503d95691 100644
--- a/src/Gui/DlgParameterFind.cpp
+++ b/src/Gui/DlgParameterFind.cpp
@@ -250,6 +250,13 @@ void DlgParameterFind::accept()
         while (!next && current) {
             // go to the parent item and try again for each sibling after the current item
             QTreeWidgetItem* parent = current->parent();
+            if (!parent) {
+                // switch from one top-level group to the next
+                QTreeWidgetItem* root = groupTree->invisibleRootItem();
+                if (root->indexOfChild(current) >= 0) {
+                    parent = root;
+                }
+            }
             if (parent) {
                 int index = parent->indexOfChild(current);
                 for (int i=index+1; i<parent->childCount(); i++) {