Index: sources/gui/qml/main.qml
===================================================================
diff -u -r5687815256ae070a9a207107088e3f72dd464da0 -r40c81d8364424610feeffeb5ac30e990105c8c00
--- sources/gui/qml/main.qml	(.../main.qml)	(revision 5687815256ae070a9a207107088e3f72dd464da0)
+++ sources/gui/qml/main.qml	(.../main.qml)	(revision 40c81d8364424610feeffeb5ac30e990105c8c00)
@@ -394,11 +394,7 @@
         // TODO: disable this later. this is only for diagnostic purpose.
         onDoubleClicked : {
             if ( _GuiView.dryDemoMode ) {
-                let dryDemoTempID = 99
-                let id = vConfirm.id
-                vConfirm.id = dryDemoTempID
-                vConfirm.doConfirm( true  )
-                vConfirm.id = id
+                _dryDemoDialog.open()
             }
             else {
                 _diagnosticsDialog.open()
@@ -413,6 +409,7 @@
     PowerItem           { id: _powerItem        ;   z: 997 }
     ConfirmDialog       { id: _confirmDialog    ;   z: 998 }
     DiagnosticsDialog   { id: _diagnosticsDialog;   z: 999 }
+    DryDemoDialog       { id: _dryDemoDialog    ;   z: 999 }
 
     // Note: NotificationBar has to be anchored to the main menu and if it is moved into the AlarmItem
     //       then cannot be anchored.