diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml
index fb43ff2334..d2c9c864d0 100644
--- a/ui/imports/utils/Constants.qml
+++ b/ui/imports/utils/Constants.qml
@@ -3,9 +3,11 @@ pragma Singleton
 import QtQuick 2.13
 
 QtObject {
-    readonly property int onboardingAppState: 0
-    readonly property int loginAppSate: 1
-    readonly property int mainAppState: 2
+    property QtObject appState: QtObject {
+        readonly property int onboarding: 0
+        readonly property int login: 1
+        readonly property int main: 2
+    }
 
     readonly property int communityImported: 0
     readonly property int communityImportingInProgress: 1
diff --git a/ui/main.qml b/ui/main.qml
index 46455600b6..6b570ea209 100644
--- a/ui/main.qml
+++ b/ui/main.qml
@@ -20,7 +20,7 @@ import "./app/AppLayouts/Onboarding/views"
 import "./app"
 
 StatusWindow {
-    property bool hasAccounts: startupModule.appState !== Constants.onboardingAppState
+    property bool hasAccounts: startupModule.appState !== Constants.appState.onboarding
     property bool removeMnemonicAfterLogin: false
     property alias dragAndDrop: dragTarget
     property bool popupOpened: false
@@ -354,7 +354,7 @@ StatusWindow {
                 DSM.SignalTransition {
                     targetState: appState
                     signal: startupModule.appStateChanged
-                    guard: state == Constants.mainAppState
+                    guard: state == Constants.appState.main
                 }
             }
 
@@ -365,7 +365,7 @@ StatusWindow {
                 DSM.SignalTransition {
                     targetState: appState
                     signal: startupModule.appStateChanged
-                    guard: state == Constants.mainAppState
+                    guard: state == Constants.appState.main
                 }
             }
 
@@ -376,7 +376,7 @@ StatusWindow {
                 DSM.SignalTransition {
                     targetState: appState
                     signal: startupModule.appStateChanged
-                    guard: state == Constants.mainAppState
+                    guard: state == Constants.appState.main
                 }
             }
 
@@ -387,7 +387,7 @@ StatusWindow {
                 DSM.SignalTransition {
                     targetState: appState
                     signal: startupModule.appStateChanged
-                    guard: state == Constants.mainAppState
+                    guard: state == Constants.appState.main
                 }
 
                 DSM.SignalTransition {