diff --git a/ui/imports/shared/status/StatusChatCommandsPopup.qml b/ui/imports/shared/popups/ChatCommandsPopup.qml
similarity index 100%
rename from ui/imports/shared/status/StatusChatCommandsPopup.qml
rename to ui/imports/shared/popups/ChatCommandsPopup.qml
diff --git a/ui/imports/shared/popups/qmldir b/ui/imports/shared/popups/qmldir
index 04f1392049..91b5e1e2fb 100644
--- a/ui/imports/shared/popups/qmldir
+++ b/ui/imports/shared/popups/qmldir
@@ -1,3 +1,4 @@
+ChatCommandsPopup 1.0 ChatCommandsPopup.qml
 BlockContactConfirmationDialog 1.0 BlockContactConfirmationDialog.qml
 ConfirmationDialog 1.0 ConfirmationDialog.qml
 DownloadModal 1.0 DownloadModal.qml
diff --git a/ui/imports/shared/status/StatusChatInput.qml b/ui/imports/shared/status/StatusChatInput.qml
index c59a764799..8f847a09fa 100644
--- a/ui/imports/shared/status/StatusChatInput.qml
+++ b/ui/imports/shared/status/StatusChatInput.qml
@@ -10,6 +10,7 @@ import utils 1.0
 
 import shared 1.0
 import shared.panels 1.0
+import shared.popups 1.0
 
 //TODO remove this dependency
 import "../../../app/AppLayouts/Chat/panels"
@@ -632,7 +633,7 @@ Rectangle {
         }
     }
 
-    StatusChatCommandsPopup {
+    ChatCommandsPopup {
         id: chatCommandsPopup
         x: 8
         y: -height