diff --git a/src/Gui/Command.cpp b/src/Gui/Command.cpp
index f637c90dbb..f2df41be00 100644
--- a/src/Gui/Command.cpp
+++ b/src/Gui/Command.cpp
@@ -610,18 +610,14 @@ void Command::applyCommandData(const char* context, Action* action)
         context, getMenuText()));
     action->setToolTip(QCoreApplication::translate(
         context, getToolTipText()));
+    action->setWhatsThis(QCoreApplication::translate(
+        context, getWhatsThis()));
     if (sStatusTip)
         action->setStatusTip(QCoreApplication::translate(
             context, getStatusTip()));
     else
         action->setStatusTip(QCoreApplication::translate(
             context, getToolTipText()));
-    if (sWhatsThis)
-        action->setWhatsThis(QCoreApplication::translate(
-            context, getWhatsThis()));
-    else
-        action->setWhatsThis(QCoreApplication::translate(
-            context, getToolTipText()));
     QString accel = action->shortcut().toString(QKeySequence::NativeText);
     if (!accel.isEmpty()) {
         // show shortcut inside tooltip