Index: sources/gui/qml/components/ModalDialog.qml
===================================================================
diff -u -r0ced87f43c28bcc9f3402e19284030ad1405e9e8 -r0797b3a8c28ad756be125a91c45fb53a2783dc9a
--- sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 0ced87f43c28bcc9f3402e19284030ad1405e9e8)
+++ sources/gui/qml/components/ModalDialog.qml	(.../ModalDialog.qml)	(revision 0797b3a8c28ad756be125a91c45fb53a2783dc9a)
@@ -87,6 +87,11 @@
         }
     }
 
+    // fix closing opened dialogs when opmode is changed
+    Connections { target: vTDOpMode
+        function onOpModeChanged() { if ( _root.visible ) { _root.close() } }
+    }
+
     NumberAnimation { id: _autoHideAnimation
         running: false
         target: _root