diff --git a/src/libs/utils/filewizardpage.h b/src/libs/utils/filewizardpage.h
index 26a16128bad..6ab0689705b 100644
--- a/src/libs/utils/filewizardpage.h
+++ b/src/libs/utils/filewizardpage.h
@@ -47,12 +47,12 @@ class QTCREATOR_UTILS_EXPORT FileWizardPage : public WizardPage
 
 public:
     explicit FileWizardPage(QWidget *parent = 0);
-    virtual ~FileWizardPage();
+    ~FileWizardPage();
 
     QString fileName() const;
     QString path() const;
 
-    virtual bool isComplete() const;
+    bool isComplete() const;
 
     void setFileNameLabel(const QString &label);
     void setPathLabel(const QString &label);
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp
index 0f6783b1f44..7b0fb0e6914 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.cpp
@@ -30,6 +30,8 @@
 
 #include "jsonfilepage.h"
 
+#include "jsonwizard.h"
+
 #include <QFileInfo>
 #include <QVariant>
 
@@ -39,6 +41,18 @@ JsonFilePage::JsonFilePage(QWidget *parent) :
     Utils::FileWizardPage(parent)
 { }
 
+void JsonFilePage::initializePage()
+{
+    JsonWizard *wiz = qobject_cast<JsonWizard *>(wizard());
+    if (!wiz)
+        return;
+
+    if (fileName().isEmpty())
+        setFileName(wiz->value(QLatin1String("InitialFileName")).toString());
+    if (path().isEmpty())
+        setPath(wiz->value(QLatin1String("InitialPath")).toString());
+}
+
 bool JsonFilePage::validatePage()
 {
     if (path().isEmpty() || fileName().isEmpty())
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h
index ef8b9e85e2c..ae22e392593 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h
+++ b/src/plugins/projectexplorer/jsonwizard/jsonfilepage.h
@@ -43,6 +43,7 @@ class JsonFilePage : public Utils::FileWizardPage
 public:
     JsonFilePage(QWidget *parent = 0);
 
+    void initializePage();
     bool validatePage();
 };
 
diff --git a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
index 5bb437d4e3f..7cf4d3fa04c 100644
--- a/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
+++ b/src/plugins/projectexplorer/jsonwizard/jsonwizardpagefactory_p.cpp
@@ -102,11 +102,11 @@ FilePageFactory::FilePageFactory()
 
 Utils::WizardPage *FilePageFactory::create(JsonWizard *wizard, Core::Id typeId, const QVariant &data)
 {
+    Q_UNUSED(wizard);
     Q_UNUSED(data);
     QTC_ASSERT(canCreate(typeId), return 0);
 
     JsonFilePage *page = new JsonFilePage;
-    page->setPath(wizard->value(QStringLiteral("InitialPath")).toString());
     return page;
 }