diff --git a/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp b/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
index a0aaf0fa..a6e506b5 100644
--- a/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
+++ b/SHADE_Engine/src/Editor/EditorWindow/AssetBrowser/SHAssetBrowser.cpp
@@ -376,7 +376,9 @@ namespace SHADE
       {
           if(editor->LoadScene(asset->id))
           {
+#ifdef SHEDITOR
             editor->editorConfig->workingSceneID = asset->id;
+#endif
           }
       }
         break;
diff --git a/SHADE_Engine/src/Editor/SHEditor.cpp b/SHADE_Engine/src/Editor/SHEditor.cpp
index 346bfbed..6d71f98d 100644
--- a/SHADE_Engine/src/Editor/SHEditor.cpp
+++ b/SHADE_Engine/src/Editor/SHEditor.cpp
@@ -592,8 +592,10 @@ namespace SHADE
     {
       //Load the scene
       sceneToLoad = 0;
+#ifdef SHEDITOR
       editorConfig->workingSceneID = assetID;
       SHConfigurationManager::SaveEditorConfig();
+#endif
       SHSceneManager::RestartScene(assetID);
       return true;
     }