diff --git a/addons/Wwise/native/src/editor/inspector_plugin/ak_inspector_plugin.cpp b/addons/Wwise/native/src/editor/inspector_plugin/ak_inspector_plugin.cpp
index 3b80a87b..fef39e95 100644
--- a/addons/Wwise/native/src/editor/inspector_plugin/ak_inspector_plugin.cpp
+++ b/addons/Wwise/native/src/editor/inspector_plugin/ak_inspector_plugin.cpp
@@ -24,7 +24,9 @@ Dictionary AkInspectorTree::get_wwise_ids(const AkUtils::AkType ak_type)
 
 			if (!path.is_empty())
 			{
-				Ref<Script> script = ResourceLoader::get_singleton()->load(path);
+				Ref<Script> script = ResourceLoader::get_singleton()->load(
+						path, String(), ResourceLoader::CacheMode::CACHE_MODE_IGNORE);
+
 				Dictionary script_constants = script->get_script_constant_map();
 
 				String type_constant{};
@@ -345,6 +347,7 @@ void AkInspectorEditorProperty::init(const AkUtils::AkType type, const Dictionar
 void AkInspectorEditorProperty::open_popup()
 {
 	add_child(window);
+	window->tree->populate_browser("");
 
 	double editor_scale = WwiseEditorScale::get_singleton()->get_editor_scale();
 
@@ -442,7 +445,6 @@ void AkInspectorEditorProperty::_update_property()
 	close_popup();
 
 	get_edited_object()->notify_property_list_changed();
-	window->tree->populate_browser("");
 
 	updating = false;
 }
diff --git a/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.cpp b/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.cpp
index 22c70527..7f0e280a 100644
--- a/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.cpp
+++ b/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.cpp
@@ -64,7 +64,7 @@ void WaapiPicker::create_project_objects_tree()
 	for (int64_t i = 0; i < data_array.size(); i++)
 	{
 		Dictionary object = data_array[i];
-		if (object["type"] == "Project")
+		if (object["type"] == String("Project"))
 		{
 			root->set_text(0, object["name"]);
 			break;
@@ -75,7 +75,7 @@ void WaapiPicker::create_project_objects_tree()
 	{
 		Dictionary object = data_array[i];
 
-		if (object["type"] == "WorkUnit")
+		if (object["type"] == String("WorkUnit"))
 		{
 			TreeItem* item{};
 
@@ -839,18 +839,25 @@ void WaapiPicker::_on_file_dialog_file_selected(const String& path)
 		return;
 	}
 
-	Ref<FileAccess> wwise_ids_gd_file = FileAccess::open(path, FileAccess::WRITE);
-	wwise_ids_gd_file->store_string(final_text);
-	wwise_ids_gd_file->close();
+	bool file_exists = FileAccess::file_exists(path);
+
+	if (!file_exists)
+	{
+		Ref<FileAccess> wwise_ids_gd_file = FileAccess::open(path, FileAccess::WRITE);
+		wwise_ids_gd_file->close();
+		EditorFileSystem* filesystem = get_editor_interface()->get_resource_filesystem();
+		filesystem->update_file(path);
+	}
+
+	Ref<Script> script = ResourceLoader::get_singleton()->load(path, "Script", ResourceLoader::CACHE_MODE_REPLACE);
+	script->set_source_code(final_text);
+	ResourceSaver::get_singleton()->save(script, path);
 
 	UtilityFunctions::print("[Wwise] Generated IDs at " + path);
 
 	file_dialog->queue_free();
 	final_text = "";
 
-	EditorFileSystem* filesystem = get_editor_interface()->get_resource_filesystem();
-	filesystem->update_file(path);
-
 	if (Waapi::get_singleton()->is_client_connected())
 	{
 		Waapi::get_singleton()->disconnect_client();
diff --git a/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.h b/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.h
index 77e4a786..5e8fbecc 100644
--- a/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.h
+++ b/addons/Wwise/native/src/editor/waapi_picker/waapi_picker.h
@@ -14,6 +14,7 @@
 #include <godot_cpp/classes/packed_scene.hpp>
 #include <godot_cpp/classes/project_settings.hpp>
 #include <godot_cpp/classes/resource_loader.hpp>
+#include <godot_cpp/classes/resource_saver.hpp>
 #include <godot_cpp/classes/script.hpp>
 #include <godot_cpp/classes/tree.hpp>
 #include <godot_cpp/classes/tree_item.hpp>