1 files changed, 15 insertions, 6 deletions
diff --git a/ui/ui.go b/ui/ui.go
index 316fbefe..56d67e65 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -40,14 +40,23 @@ func RunUI() {
 		return
 	}
 
-	mtw, err := NewManageTunnelsWindow()
-	if err != nil {
-		panic(err)
+	var (
+		mtw  *ManageTunnelsWindow
+		tray *Tray
+	)
+
+	for mtw == nil {
+		mtw, err = NewManageTunnelsWindow()
+		if err != nil {
+			time.Sleep(time.Millisecond * 400)
+		}
 	}
 
-	tray, err := NewTray(mtw)
-	if err != nil {
-		panic(err)
+	for tray == nil {
+		tray, err = NewTray(mtw)
+		if err != nil {
+			time.Sleep(time.Millisecond * 400)
+		}
 	}
 
 	go func() {