diff --git a/src/dialogs/QskDialog.cpp b/src/dialogs/QskDialog.cpp
index 5a61d8d3..69350b1a 100644
--- a/src/dialogs/QskDialog.cpp
+++ b/src/dialogs/QskDialog.cpp
@@ -109,13 +109,19 @@ namespace
                 setGeometry( r );
             }
 
-            if ( size.isValid() )
+            auto adjustSize = [this]()
             {
-                setFlags( flags() | Qt::MSWindowsFixedSizeDialogHint );
-                setFixedSize( size );
-            }
+                const QSize size = sizeConstraint();
 
-            setModality( Qt::ApplicationModal );
+                if ( size.isValid() )
+                {
+                    setFlags( flags() | Qt::MSWindowsFixedSizeDialogHint );
+                    setFixedSize( size );
+                }
+            };
+
+            connect( contentItem(), &QQuickItem::widthChanged, this, adjustSize );
+            connect( contentItem(), &QQuickItem::heightChanged, this, adjustSize );
         }
 
         QskDialog::DialogCode exec()