diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
index f9526756e799b3d76d39436ecce69abcacb0d486..d18b3fb0ec87cedf86881dbaf4ebd99986ed6b2f 100644
--- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
@@ -85,7 +85,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
     setPage(CMakeRunPageId, new CMakeRunPage(this));
 
     setStartId(startid);
-    setOption(QWizard::NoCancelButton);
     init();
 }
 
@@ -101,7 +100,6 @@ CMakeOpenProjectWizard::CMakeOpenProjectWizard(CMakeManager *cmakeManager, const
         addPage(new CMakeRunPage(this, CMakeRunPage::Recreate, buildDirectory));
     else
         addPage(new CMakeRunPage(this, CMakeRunPage::Update, buildDirectory));
-    setOption(QWizard::NoCancelButton);
     init();
 }
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 770ee8411faa4ca33d9cacd1190ba48bfb0c397a..a799cf72657652cb6d3497851eed05e686617d73 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -648,7 +648,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
         // and the cmake command line
 
         CMakeOpenProjectWizard copw(m_manager, sourceDirectory(), ProjectExplorer::Environment::systemEnvironment());
-        copw.exec();
+        if (copw.exec() != QDialog::Accepted)
+            return false;
 
         qDebug()<<"ccd.buildDirectory()"<<copw.buildDirectory();
 
@@ -690,7 +691,8 @@ bool CMakeProject::restoreSettingsImpl(ProjectExplorer::PersistentSettingsReader
                                         buildDirectory(activeBC),
                                         mode,
                                         environment(activeBC));
-            copw.exec();
+            if (copw.exec() != QDialog::Accepted)
+                return false;
             activeBC->setValue("msvcVersion", copw.msvcVersion());
         }
     }