diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index 0fde459ef6..72f730ea77 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -885,6 +885,12 @@ void Command::applyCommandData(const char* context, Action* action)
     else
         action->setStatusTip(QCoreApplication::translate(
             context, getToolTipText()));
+
+    // Default to QAction::NoRole instead of QAction::TextHeuristicRole to stop collisions with
+    // e.g. "Preferences" and "Copy"
+    if (action->action()->menuRole() == QAction::TextHeuristicRole) {
+        action->setMenuRole(QAction::NoRole);
+    }
 }