diff --git a/src/Gui/DlgExpressionInput.cpp b/src/Gui/DlgExpressionInput.cpp
index d2965e0b0dae..637b27e5e4d7 100644
--- a/src/Gui/DlgExpressionInput.cpp
+++ b/src/Gui/DlgExpressionInput.cpp
@@ -107,7 +107,6 @@ DlgExpressionInput::DlgExpressionInput(const App::ObjectIdentifier & _path,
             this->resize(ui->expression->width()+18,this->height());
     }
     ui->expression->setFocus();
-    ui->expression->activateWindow();
 }
 
 DlgExpressionInput::~DlgExpressionInput()
@@ -268,6 +267,13 @@ void DlgExpressionInput::mousePressEvent(QMouseEvent* ev)
     }
 }
 
+void DlgExpressionInput::show()
+{
+    QDialog::show();
+    this->activateWindow();
+    ui->expression->selectAll();
+}
+
 void DlgExpressionInput::showEvent(QShowEvent* ev)
 {
     QDialog::showEvent(ev);
diff --git a/src/Gui/DlgExpressionInput.h b/src/Gui/DlgExpressionInput.h
index 90cd6feccf28..c6d6d5c34adc 100644
--- a/src/Gui/DlgExpressionInput.h
+++ b/src/Gui/DlgExpressionInput.h
@@ -63,6 +63,9 @@ class GuiExport DlgExpressionInput : public QDialog
 
     bool eventFilter(QObject *obj, QEvent *event);
 
+public Q_SLOTS:
+    void show();
+
 protected:
     void showEvent(QShowEvent*);
     void mouseReleaseEvent(QMouseEvent*);