diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml
index e8eb941814..637ba4167f 100644
--- a/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml
+++ b/ui/app/AppLayouts/Chat/CommunityComponents/CreateCommunityPopup.qml
@@ -5,6 +5,7 @@ import QtQuick.Dialogs 1.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 
 import StatusQ.Core 0.1
 import StatusQ.Core.Theme 0.1
diff --git a/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml b/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
index d860fcbf43..c012b2b617 100644
--- a/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
+++ b/ui/app/AppLayouts/Profile/popups/ChangeProfilePicModal.qml
@@ -3,8 +3,10 @@ import QtQuick.Dialogs 1.3
 
 import utils 1.0
 import "../../../../shared"
+import "../../../../shared/popups"
 import "../../../../shared/status"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property string selectedImage // selectedImage is for us to be able to analyze it before setting it as current
     property string uploadError
diff --git a/ui/shared/ImageCropperModal.qml b/ui/shared/popups/ImageCropperModal.qml
similarity index 97%
rename from ui/shared/ImageCropperModal.qml
rename to ui/shared/popups/ImageCropperModal.qml
index 9042f63463..e89d4fb027 100644
--- a/ui/shared/ImageCropperModal.qml
+++ b/ui/shared/popups/ImageCropperModal.qml
@@ -3,9 +3,11 @@ import QtQuick.Controls 2.13
 import QtQuick.Layouts 1.13
 
 import utils 1.0
-import "./status"
-import "./controls"
+import "../"
+import "../status"
+import "../controls"
 
+// TODO: replace with StatusModal
 ModalPopup {
     property string selectedImage
     property string ratio: "1:1"