diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index b93d55c17..e4aa3e526 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -238,24 +238,8 @@ void Launcher::MainDialog::changePage(QListWidgetItem *current, QListWidgetItem
         current = previous;
 
     int currentIndex = iconWidget->row(current);
-//    int previousIndex = iconWidget->row(previous);
-
     pagesWidget->setCurrentIndex(currentIndex);
-
-    //    DataFilesPage *previousPage = dynamic_cast<DataFilesPage *>(pagesWidget->widget(previousIndex));
-    //    DataFilesPage *currentPage = dynamic_cast<DataFilesPage *>(pagesWidget->widget(currentIndex));
-
-    //    //special call to update/save data files page list view when it's displayed/hidden.
-    //    if (previousPage)
-    //    {
-    //        if (previousPage->objectName() == "DataFilesPage")
-    //            previousPage->saveSettings();
-    //    }
-    //    else if (currentPage)
-    //    {
-    //        if (currentPage->objectName() == "DataFilesPage")
-    //            currentPage->loadSettings();
-    //    }
+    mSettingsPage->resetProgressBar();
 }
 
 bool Launcher::MainDialog::setupLauncherSettings()
diff --git a/apps/launcher/settingspage.cpp b/apps/launcher/settingspage.cpp
index c172a3121..a1f6fb0c2 100644
--- a/apps/launcher/settingspage.cpp
+++ b/apps/launcher/settingspage.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include <QDebug>
 #include <QDir>
+#include <QTimer>
 
 #include <components/files/configurationmanager.hpp>
 
@@ -39,6 +40,7 @@ Launcher::SettingsPage::SettingsPage(Files::ConfigurationManager &cfg,
 
     mWizardInvoker = new ProcessInvoker();
     mImporterInvoker = new ProcessInvoker();
+    resetProgressBar();
 
     connect(mWizardInvoker->getProcess(), SIGNAL(started()),
             this, SLOT(wizardStarted()));
@@ -141,8 +143,13 @@ void Launcher::SettingsPage::on_importerButton_clicked()
 
     qDebug() << "arguments " << arguments;
 
+    // start the progress bar as a "bouncing ball"
+    progressBar->setMaximum(0);
+    progressBar->setValue(0);
     if (!mImporterInvoker->startProcess(QLatin1String("openmw-iniimporter"), arguments, false))
-        return;
+    {
+        resetProgressBar();
+    }
 }
 
 void Launcher::SettingsPage::on_browseButton_clicked()
@@ -197,38 +204,36 @@ void Launcher::SettingsPage::importerStarted()
 void Launcher::SettingsPage::importerFinished(int exitCode, QProcess::ExitStatus exitStatus)
 {
     if (exitCode != 0 || exitStatus == QProcess::CrashExit)
-        return;
-
-    // Importer may have changed settings, so refresh
-    mMain->reloadSettings();
-
-    // Import selected data files from openmw.cfg
-    if (addonsCheckBox->isChecked())
     {
-        // Because we've reloaded settings, the current content list matches content in OpenMW.cfg
-        QString oldContentListName = mLauncherSettings.getCurrentContentListName();
-        if (mProfileDialog->exec() == QDialog::Accepted)
-        {
-            // remove the current content list to prevent duplication
-            //... except, not allowed to delete the Default content list
-            if (oldContentListName.compare(DataFilesPage::mDefaultContentListName) != 0)
-            {
-                mLauncherSettings.removeContentList(oldContentListName);
-            }
+        resetProgressBar();
 
-            const QString newContentListName(mProfileDialog->lineEdit()->text());
-            const QStringList files(mGameSettings.getContentList());
-            mLauncherSettings.setCurrentContentListName(newContentListName);
-            mLauncherSettings.setContentList(newContentListName, files);
+        QMessageBox msgBox;
+        msgBox.setWindowTitle(tr("Importer finished"));
+        msgBox.setStandardButtons(QMessageBox::Ok);
+        msgBox.setIcon(QMessageBox::Warning);
+        msgBox.setText(tr("Failed to import settings from INI file."));
+        msgBox.exec();
+    }
+    else
+    {
+        // indicate progress finished
+        progressBar->setMaximum(1);
+        progressBar->setValue(1);
 
-            // Make DataFiles Page load the new content list.
-            mMain->reloadSettings();
-        }
+        // Importer may have changed settings, so refresh
+        mMain->reloadSettings();
     }
 
     importerButton->setEnabled(true);
 }
 
+void Launcher::SettingsPage::resetProgressBar()
+{
+    // set progress bar to 0 %
+    progressBar->setMaximum(1);
+    progressBar->setValue(0);
+}
+
 void Launcher::SettingsPage::updateOkButton(const QString &text)
 {
     // We do this here because we need to access the profiles
diff --git a/apps/launcher/settingspage.hpp b/apps/launcher/settingspage.hpp
index 124c80600..ccc2061dd 100644
--- a/apps/launcher/settingspage.hpp
+++ b/apps/launcher/settingspage.hpp
@@ -29,6 +29,9 @@ namespace Launcher
 
         void saveSettings();
         bool loadSettings();
+        
+        /// set progress bar on page to 0%
+        void resetProgressBar();
 
     private slots:
 
@@ -57,7 +60,6 @@ namespace Launcher
         MainDialog *mMain;
         TextInputDialog *mProfileDialog;
 
-
     };
 }
 
diff --git a/components/config/launchersettings.cpp b/components/config/launchersettings.cpp
index 66f05f691..1d4b428c9 100644
--- a/components/config/launchersettings.cpp
+++ b/components/config/launchersettings.cpp
@@ -105,6 +105,12 @@ void Config::LauncherSettings::setContentList(const GameSettings& gameSettings)
     // obtain content list from game settings (if present)
     const QStringList files(gameSettings.getContentList());
 
+    // if openmw.cfg has no content, exit so we don't create an empty content list.
+    if (files.isEmpty())
+    {
+        return;
+    }
+
     // if any existing profile in launcher matches the content list, make that profile the default
     foreach(const QString &listName, getContentLists())
     {
diff --git a/files/ui/settingspage.ui b/files/ui/settingspage.ui
index 6c873ea92..7f5e4a7de 100644
--- a/files/ui/settingspage.ui
+++ b/files/ui/settingspage.ui
@@ -131,6 +131,13 @@
           </property>
          </widget>
         </item>
+        <item row="3" column="0">
+         <widget class="QProgressBar" name="progressBar">
+          <property name="maximum">
+           <number>4</number>
+          </property>
+         </widget>
+        </item>
        </layout>
       </item>
      </layout>