diff --git a/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp b/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp
index 2856d5a923..557045c8f1 100644
--- a/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp
+++ b/Core/GDCore/IDE/Dialogs/ResourcesEditor.cpp
@@ -999,6 +999,12 @@ void ResourcesEditor::OnresourcesTreeItemActivated(wxTreeEvent& event)
 
     AuiManager1->GetPane(propertiesPanel).Show();
     AuiManager1->Update();
+
+    #if !defined(WINDOWS) //MacOS and wxGTK needs additional tweaks
+    AuiManager1->GetPane(propertiesPanel).Dock().Bottom(); //Ensure panel is docked otherwise it can't get focus.
+    AuiManager1->Update();
+    toolbar->Realize(); //Toolbar is emptied if not realized again after calling Update.
+    #endif
 }
 
 /**