diff --git a/apps/launcher/advancedpage.hpp b/apps/launcher/advancedpage.hpp
index 82b9c3b65..59de3d319 100644
--- a/apps/launcher/advancedpage.hpp
+++ b/apps/launcher/advancedpage.hpp
@@ -23,12 +23,6 @@ namespace Launcher
         bool loadSettings();
         void saveSettings();
 
-        /**
-         * Load the cells associated with the given content files for use in autocomplete
-         * @param filePaths the file paths of the content files to be examined
-         */
-        void loadCellsForAutocomplete(QStringList filePaths);
-
     public slots:
         void slotLoadedCellsChanged(QStringList cellNames);
 
@@ -41,6 +35,11 @@ namespace Launcher
         Config::GameSettings &mGameSettings;
         Settings::Manager &mEngineSettings;
 
+        /**
+         * Load the cells associated with the given content files for use in autocomplete
+         * @param filePaths the file paths of the content files to be examined
+         */
+        void loadCellsForAutocomplete(QStringList filePaths);
         void loadSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
         void saveSettingBool(QCheckBox *checkbox, const std::string& setting, const std::string& group);
     };
diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 76ca893c4..b3c8fb14a 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -18,6 +18,7 @@
 
 #include <components/config/gamesettings.hpp>
 #include <components/config/launchersettings.hpp>
+#include <iostream>
 
 #include "utils/textinputdialog.hpp"
 #include "utils/profilescombobox.hpp"
@@ -47,6 +48,8 @@ Launcher::DataFilesPage::DataFilesPage(Files::ConfigurationManager &cfg, Config:
     // the addons and don't want to get signals of the system doing it during startup.
     connect(mSelector, SIGNAL(signalAddonDataChanged(QModelIndex,QModelIndex)),
             this, SLOT(slotAddonDataChanged()));
+    // Call manually to indicate all changes to addon data during startup.
+    slotAddonDataChanged();
 }
 
 void Launcher::DataFilesPage::buildView()
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
index 79f3e5c67..a70f6ff7f 100644
--- a/apps/launcher/maindialog.cpp
+++ b/apps/launcher/maindialog.cpp
@@ -125,9 +125,6 @@ void Launcher::MainDialog::createPages()
     mPlayPage->setProfilesModel(mDataFilesPage->profilesModel());
     mPlayPage->setProfilesIndex(mDataFilesPage->profilesIndex());
 
-    // Load cells for the "Start default character at" field
-    mAdvancedPage->loadCellsForAutocomplete(mDataFilesPage->selectedFilePaths());
-
     // Add the pages to the stacked widget
     pagesWidget->addWidget(mPlayPage);
     pagesWidget->addWidget(mDataFilesPage);