diff --git a/storybook/pages/PopupSizingPage.qml b/storybook/pages/PopupSizingPage.qml
index 11c27ddcc8..a3c754da05 100644
--- a/storybook/pages/PopupSizingPage.qml
+++ b/storybook/pages/PopupSizingPage.qml
@@ -48,6 +48,15 @@ Item {
             when: false
         }
 
+        onImplicitContentHeightChanged: {
+            if (!workAroundCheckBox.checked)
+                return
+
+            workaroundBinding.value = popup.margins + 1
+            workaroundBinding.when = true
+            workaroundBinding.when = false
+        }
+
         ColumnLayout {
             Button {
                 text: "Some button 1"
@@ -60,15 +69,6 @@ Item {
                  Layout.fillWidth: true
             }
 
-            onImplicitHeightChanged: {
-                if (!workAroundCheckBox.checked)
-                    return
-
-                workaroundBinding.value = popup.margins + 1
-                workaroundBinding.when = true
-                workaroundBinding.when = false
-            }
-
             anchors.fill: parent
 
             ListView {
diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusDropdown.qml b/ui/StatusQ/src/StatusQ/Controls/StatusDropdown.qml
index 05d485cc8e..c404ffaff7 100644
--- a/ui/StatusQ/src/StatusQ/Controls/StatusDropdown.qml
+++ b/ui/StatusQ/src/StatusQ/Controls/StatusDropdown.qml
@@ -57,13 +57,9 @@ QC.Popup {
         restoreMode: Binding.RestoreBindingOrValue
     }
 
-    Connections {
-        target: root.contentItem
-
-        function onImplicitHeightChanged() {
-            workaroundBinding.value = root.margins + 1
-            workaroundBinding.when = true
-            workaroundBinding.when = false
-        }
+    onImplicitContentHeightChanged: {
+        workaroundBinding.value = root.margins + 1
+        workaroundBinding.when = true
+        workaroundBinding.when = false
     }
 }
diff --git a/ui/StatusQ/src/StatusQ/Popups/Dialog/StatusDialog.qml b/ui/StatusQ/src/StatusQ/Popups/Dialog/StatusDialog.qml
index ead110783a..a190597e2e 100644
--- a/ui/StatusQ/src/StatusQ/Popups/Dialog/StatusDialog.qml
+++ b/ui/StatusQ/src/StatusQ/Popups/Dialog/StatusDialog.qml
@@ -37,6 +37,12 @@ Dialog {
         restoreMode: Binding.RestoreBindingOrValue
     }
 
+    onImplicitContentHeightChanged: {
+        workaroundBinding.value = root.margins + 1
+        workaroundBinding.when = true
+        workaroundBinding.when = false
+    }
+
     standardButtons: Dialog.Cancel | Dialog.Ok
 
     Overlay.modal: Rectangle {
diff --git a/ui/imports/shared/popups/SendModal.qml b/ui/imports/shared/popups/SendModal.qml
index 75d5fe982e..6c5c6dfb0b 100644
--- a/ui/imports/shared/popups/SendModal.qml
+++ b/ui/imports/shared/popups/SendModal.qml
@@ -167,12 +167,6 @@ StatusDialog {
 
         anchors.fill: parent
 
-        // Workaround for https://bugreports.qt.io/browse/QTBUG-87804
-        onImplicitHeightChanged: {
-            margins--
-            margins++
-        }
-
         ClippingWrapper {
             Layout.fillWidth: true
             Layout.preferredHeight: assetAndAmountSelector.implicitHeight