diff --git a/src/gui/loot_app.cpp b/src/gui/loot_app.cpp
index f1f21a2b..90cd7e80 100644
--- a/src/gui/loot_app.cpp
+++ b/src/gui/loot_app.cpp
@@ -50,6 +50,10 @@ namespace loot {
         LootPaths::initialise();
     }
 
+    void LootApp::Initialise(const std::string& commandLineGameArg) {
+        lootState_.Init(commandLineGameArg);
+    }
+
     void LootApp::OnBeforeCommandLineProcessing(const CefString& process_type,
                                                 CefRefPtr<CefCommandLine> command_line) {
         if (process_type.empty()) {
@@ -87,7 +91,7 @@ namespace loot {
 #endif
 
         // Set the handler for browser-level callbacks.
-        CefRefPtr<LootHandler> handler(new LootHandler(lootState));
+        CefRefPtr<LootHandler> handler(new LootHandler(lootState_));
 
         // Register the custom "loot" scheme handlers.
         CefRegisterSchemeHandlerFactory("loot", "l10n", new LootSchemeHandlerFactory());
@@ -98,13 +102,13 @@ namespace loot {
         // Need to set the global locale for this process so that messages will
         // be translated.
         BOOST_LOG_TRIVIAL(debug) << "Initialising language settings in UI thread.";
-        if (lootState.getLanguage().Code() != Language::english) {
+        if (lootState_.getLanguage().Code() != Language::english) {
             boost::locale::generator gen;
             gen.add_messages_path(LootPaths::getL10nPath().string());
             gen.add_messages_domain("loot");
 
-            BOOST_LOG_TRIVIAL(debug) << "Selected language: " << lootState.getLanguage().Name();
-            locale::global(gen(lootState.getLanguage().Locale() + ".UTF-8"));
+            BOOST_LOG_TRIVIAL(debug) << "Selected language: " << lootState_.getLanguage().Name();
+            locale::global(gen(lootState_.getLanguage().Locale() + ".UTF-8"));
             boost::filesystem::path::imbue(locale());
         }
 
diff --git a/src/gui/loot_app.h b/src/gui/loot_app.h
index cc98a74f..b3486ae8 100644
--- a/src/gui/loot_app.h
+++ b/src/gui/loot_app.h
@@ -37,6 +37,7 @@ namespace loot {
         public CefRenderProcessHandler {
     public:
         LootApp();
+        void Initialise(const std::string& commandLineGameArg);
 
         // Override CefApp methods.
         virtual void OnBeforeCommandLineProcessing(const CefString& process_type,
@@ -54,8 +55,8 @@ namespace loot {
                                               CefProcessId source_process,
                                               CefRefPtr<CefProcessMessage> message) OVERRIDE;
 
-        LootState lootState;
     private:
+        LootState lootState_;
         CefRefPtr<CefMessageRouterRendererSide> message_router_;
 
         virtual void OnContextCreated(CefRefPtr<CefBrowser> browser,
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index a10d541b..89b9f711 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -146,7 +146,7 @@ int main(int argc, char* argv[]) {
         gameStr = command_line->GetSwitchValue("game");
     }
 
-    app.get()->lootState.Init(gameStr);
+    app.get()->Initialise(gameStr);
 
     // Back to CEF
     //------------