diff --git a/containment/package/contents/ui/main.qml b/containment/package/contents/ui/main.qml
index 5e6b9a0d5..b3f96cdf8 100644
--- a/containment/package/contents/ui/main.qml
+++ b/containment/package/contents/ui/main.qml
@@ -48,6 +48,7 @@ DragDrop.DropArea {
 
     ////BEGIN properties
     property bool debugMode: Qt.application.arguments.indexOf("--graphics")>=0
+    property bool debugModeWindow: Qt.application.arguments.indexOf("--with-window")>=0
     property bool globalDirectRender: false //it is used as a globalDirectRender for all elements in the dock
     property bool directRenderTimerIsRunning: enableDirectRenderTimer.running
     property int directRenderAnimationTime: 0
@@ -1150,7 +1151,7 @@ DragDrop.DropArea {
     }
 
     Loader{
-        active: root.debugMode
+        active: root.debugModeWindow
         sourceComponent: DebugWindow{}
     }