diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml
index b7d771e959..a49899acf7 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn.qml
@@ -82,6 +82,10 @@ StackLayout {
         id: messageContextMenu
     }
 
+    StatusImageModal {
+        id: imagePopup
+    }
+
     property var idMap: ({})
     property var suggestionsObj: ([])
 
diff --git a/ui/app/AppMain.qml b/ui/app/AppMain.qml
index 6c61d66d55..b2068f0c11 100644
--- a/ui/app/AppMain.qml
+++ b/ui/app/AppMain.qml
@@ -295,10 +295,6 @@ RowLayout {
         id: toastMessage
     }
 
-    StatusImageModal {
-        id: imagePopup
-    }
-
     // Add SendModal here as it is used by the Wallet as well as the Browser
     Loader {
         id: sendModal
diff --git a/vendor/status-go b/vendor/status-go
index ec0e6dffd1..b395144704 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit ec0e6dffd198d44d71ec7b8c14d5216eb65c692d
+Subproject commit b395144704f29c9e1f4fd11714d1031a10160ad1