diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm
index 6590e9f43ff6d3743189558b31421fc742d40c0b..fb015a5a1df065d03d11f895b905f75b2a8a8cd9 100644
--- a/src/AppDelegate.mm
+++ b/src/AppDelegate.mm
@@ -338,6 +338,7 @@ static void ReachabilityCallback(SCNetworkReachabilityRef __unused target, SCNet
         self.ringWindowController = [[RingWindowController alloc] initWithWindowNibName:@"RingWindow" bundle: nil accountModel:&lrc->getAccountModel() dataTransferModel:&lrc->getDataTransferModel() behaviourController:&lrc->getBehaviorController() avModel: &lrc->getAVModel()];
     }
     [[NSApplication sharedApplication] removeWindowsItem:self.wizard.window];
+    self.wizard = nil;
     [self.ringWindowController.window makeKeyAndOrderFront:self];
 }
 
diff --git a/src/RingWindowController.mm b/src/RingWindowController.mm
index 1a2a3e074800ceaecf2a9f5ecca031328ff3d199..3fde23cb522d43b06f734edfc6764bea0ae1366e 100644
--- a/src/RingWindowController.mm
+++ b/src/RingWindowController.mm
@@ -498,6 +498,12 @@ typedef NS_ENUM(NSInteger, ViewState) {
     [smartViewVC clearConversationModel];
     [self changeViewTo:SHOW_WELCOME_SCREEN];
     [self updateRingID];
+    qrcodeView.animator.alphaValue = 0.0;
+    [centerYQRCodeConstraint.animator setConstant: 0];
+    [centerYWelcomeContainerConstraint.animator setConstant: 0];
+    [self close];
+    AppDelegate* delegate = (AppDelegate*)[[NSApplication sharedApplication] delegate];
+    [delegate showWizard];
 }
 
 -(void)rightPanelClosed