diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 2a0f83be3a..eb399aedee 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -4066,7 +4066,10 @@ void EditorNode::_check_system_theme_changed() {
 	}
 
 	if (system_theme_changed) {
+		class_icon_cache.clear();
 		_update_theme();
+		_build_icon_type_cache();
+		recent_scenes->reset_size();
 	} else if (menu_type == MENU_TYPE_GLOBAL && display_server->is_dark_mode_supported() && display_server->is_dark_mode() != last_dark_mode_state) {
 		last_dark_mode_state = display_server->is_dark_mode();
 
diff --git a/editor/gui/code_editor.cpp b/editor/gui/code_editor.cpp
index 66ce17e594..8c4ce07570 100644
--- a/editor/gui/code_editor.cpp
+++ b/editor/gui/code_editor.cpp
@@ -1635,6 +1635,11 @@ void CodeTextEditor::_update_text_editor_theme() {
 	}
 
 	_update_font_ligatures();
+
+	update_editor_settings();
+	if (text_editor->get_code_completion_selected_index() != -1) {
+		_complete_request();
+	}
 }
 
 void CodeTextEditor::_update_font_ligatures() {