diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
index 118d790f14..4b859e48d2 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
@@ -83,7 +83,6 @@ Rectangle {
     ChannelContextMenu {
         id: channelContextMenu
         groupInfoPopup: groupInfoPopup
-        groupsListView: chatGroupsListView
     }
 
     Connections {
diff --git a/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml b/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
index 123df81eca..01928e9fc5 100644
--- a/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
+++ b/ui/app/AppLayouts/Wallet/SetCurrencyModal.qml
@@ -6,7 +6,11 @@ import "../../../imports"
 import "../../../shared"
 import "./components"
 
-Item {
+ModalPopup {
+    id: popup
+    width: 480
+    height: 510
+
     function open() {
         popup.open()
         setCurrencyModalContent.currency = walletModel.defaultCurrency
@@ -16,25 +20,19 @@ Item {
         popup.close()
     }
 
-    ModalPopup {
-        id: popup
-        width: 480
-        height: 510
+    title: qsTr("Set Currency")
 
-        title: qsTr("Set Currency")
+    SetCurrencyModalContent {
+        id: setCurrencyModalContent
+    }
 
-        SetCurrencyModalContent {
-            id: setCurrencyModalContent
-        }
-
-        footer: StyledButton {
-            anchors.right: parent.right
-            //% "Save"
-            label: qsTrId("save")
-            onClicked: {
-                console.log("TODO: apply all accounts")
-                popup.close()
-            }
+    footer: StyledButton {
+        anchors.right: parent.right
+        //% "Save"
+        label: qsTrId("save")
+        onClicked: {
+            console.log("TODO: apply all accounts")
+            popup.close()
         }
     }
 }