diff --git a/src/ui/MainRootWindow.qml b/src/ui/MainRootWindow.qml
index f3d5dd2..d4c8ce5 100644
--- a/src/ui/MainRootWindow.qml
+++ b/src/ui/MainRootWindow.qml
@@ -436,6 +436,11 @@ ApplicationWindow {
         property alias toolSource:  toolDrawerLoader.source
         property alias toolIcon:    toolIcon.source
 
+        // Unload the loader only after closed, otherwise we will see a "blank" loader in the meantime
+        onClosed: {
+            toolDrawer.toolSource = ""
+        }
+        
         Rectangle {
             id:             toolDrawerToolbar
             anchors.left:   parent.left
@@ -492,7 +497,6 @@ ApplicationWindow {
                 width:              (backTextLabel.x + backTextLabel.width) - backIcon.x
                 onClicked: {
                     toolDrawer.visible      = false
-                    toolDrawer.toolSource   = ""
                 }
             }
         }