diff --git a/src/AnalThread.cpp b/src/AnalThread.cpp
index 03dff64d..ccef9466 100644
--- a/src/AnalThread.cpp
+++ b/src/AnalThread.cpp
@@ -87,11 +87,13 @@ void AnalThread::run()
         core->cmd("e asm.os=" + os);
     }
 
-
     if (ui->pdbCheckBox->isChecked())
     {
         core->loadPDB(ui->pdbLineEdit->text());
     }
-    //qDebug() << "Anal level: " << this->level;
+
+    // use prj.simple as default as long as regular projects are broken
+    core->setConfig("prj.simple", true);
+
     core->analyze(this->level, this->advanced);
 }
diff --git a/src/dialogs/NewFileDialog.cpp b/src/dialogs/NewFileDialog.cpp
index 4bde181c..caaf6631 100644
--- a/src/dialogs/NewFileDialog.cpp
+++ b/src/dialogs/NewFileDialog.cpp
@@ -312,6 +312,6 @@ void NewFileDialog::loadProject(const QString &project)
 {
     MainWindow *main = new MainWindow();
     main->openProject(project);
-    
+
     close();
 }
diff --git a/src/dialogs/SaveProjectDialog.cpp b/src/dialogs/SaveProjectDialog.cpp
index 21cb080b..da164bbb 100644
--- a/src/dialogs/SaveProjectDialog.cpp
+++ b/src/dialogs/SaveProjectDialog.cpp
@@ -27,6 +27,7 @@ SaveProjectDialog::SaveProjectDialog(bool quit, QWidget *parent) :
 
     ui->nameEdit->setText(core->getConfig("prj.name"));
     ui->projectsDirEdit->setText(core->getConfig("dir.projects"));
+    ui->simpleCheckBox->setChecked(core->getConfigb("prj.simple"));
     ui->filesCheckBox->setChecked(core->getConfigb("prj.files"));
     ui->gitCheckBox->setChecked(core->getConfigb("prj.git"));
     ui->zipCheckBox->setChecked(core->getConfigb("prj.zip"));
@@ -83,6 +84,7 @@ void SaveProjectDialog::accept()
 {
     CutterCore *core = CutterCore::getInstance();
     core->setConfig("dir.projects", ui->projectsDirEdit->text().toUtf8().constData());
+    core->setConfig("prj.simple", ui->simpleCheckBox->isChecked());
     core->setConfig("prj.files", ui->filesCheckBox->isChecked());
     core->setConfig("prj.git", ui->gitCheckBox->isChecked());
     core->setConfig("prj.zip", ui->zipCheckBox->isChecked());
diff --git a/src/dialogs/SaveProjectDialog.ui b/src/dialogs/SaveProjectDialog.ui
index 77b77174..c3a34814 100644
--- a/src/dialogs/SaveProjectDialog.ui
+++ b/src/dialogs/SaveProjectDialog.ui
@@ -14,9 +14,6 @@
    <string>Save Project</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="sizeConstraint">
-    <enum>QLayout::SetMinAndMaxSize</enum>
-   </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
@@ -69,6 +66,13 @@
      </item>
     </layout>
    </item>
+   <item>
+    <widget class="QCheckBox" name="simpleCheckBox">
+     <property name="text">
+      <string>Use simple project saving style (prj.simple, recommended)</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QCheckBox" name="filesCheckBox">
      <property name="text">