diff --git a/src/controllers/FloatingWindow.cpp b/src/controllers/FloatingWindow.cpp
index 8b52dedb..fb5083a6 100644
--- a/src/controllers/FloatingWindow.cpp
+++ b/src/controllers/FloatingWindow.cpp
@@ -146,6 +146,10 @@ FloatingWindow::FloatingWindow(QRect suggestedGeometry, MainWindow *parent)
         onCloseEvent(ev);
     });
 
+    view()->layoutInvalidated.connect([this] {
+        updateSizeConstraints();
+    });
+
     m_layoutDestroyedConnection = connect(m_dropArea, &QObject::destroyed, this, &FloatingWindow::scheduleDeleteLater);
 }
 
diff --git a/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp b/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp
index 44308f71..51c5dd35 100644
--- a/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp
+++ b/src/qtwidgets/views/FloatingWindow_qtwidgets.cpp
@@ -99,9 +99,7 @@ bool FloatingWindow_qtwidgets::event(QEvent *ev)
         Q_EMIT m_controller->activatedChanged();
     } else if (ev->type() == QEvent::StatusTip && QWidget::parent()) {
         // show status tips in the main window
-        return QWidget::parent()->event(ev); // TODm2: Move to base class
-    } else if (ev->type() == QEvent::LayoutRequest) {
-        m_controller->updateSizeConstraints(); // TODOm2: Move to base class
+        return QWidget::parent()->event(ev); // TODOm3: Move to base class
     }
 
     return View_qtwidgets<QWidget>::event(ev);