diff --git a/src/frontends/qt4/QGraphicsDialog.C b/src/frontends/qt4/QGraphicsDialog.C
index 40a7cab885..43b4bc5941 100644
--- a/src/frontends/qt4/QGraphicsDialog.C
+++ b/src/frontends/qt4/QGraphicsDialog.C
@@ -23,6 +23,8 @@
 
 #include "controllers/ControlGraphics.h"
 
+#include "insets/insetgraphicsParams.h"
+
 #include <QCloseEvent>
 #include <QPushButton>
 #include <QLineEdit>
@@ -124,7 +126,8 @@ QGraphicsDialog::QGraphicsDialog(QGraphics * form)
 void QGraphicsDialog::show()
 {
 	QDialog::show();
-	filename->setFocus();
+	if (form_->controller().params().filename.empty())
+		filename->setFocus();
 }