1 files changed, 5 insertions, 3 deletions
diff --git a/ui/ui.go b/ui/ui.go
index 741f254c..6805754c 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -37,8 +37,6 @@ func RunUI() {
 		tray *Tray
 	)
 
-	noTrayAvailable = version.OsIsCore()
-
 	for mtw == nil {
 		mtw, err = NewManageTunnelsWindow()
 		if err != nil {
@@ -46,9 +44,13 @@ func RunUI() {
 		}
 	}
 
-	for tray == nil && !noTrayAvailable {
+	for tray == nil {
 		tray, err = NewTray(mtw)
 		if err != nil {
+			if version.OsIsCore() {
+				noTrayAvailable = true
+				break
+			}
 			time.Sleep(time.Millisecond * 400)
 		}
 	}