diff --git a/VoidLink/Utility/Utils.m b/VoidLink/Utility/Utils.m
index df974838..8f50b618 100644
--- a/VoidLink/Utility/Utils.m
+++ b/VoidLink/Utility/Utils.m
@@ -72,12 +72,14 @@ NSString *const deviceName = @"roth";
 #endif
 
 + (void) addHelpOptionToDialog:(UIAlertController*)dialog {
+    return;/*
 #if !TARGET_OS_TV
     // tvOS doesn't have a browser
     [dialog addAction:[UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Help"] style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
         [Utils launchUrl:@"https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting"];
     }]];
 #endif
+ */
 }
 
 + (BOOL) parseAddressPortString:(NSString*)addressPort address:(NSRange*)address port:(NSRange*)port {
diff --git a/VoidLink/ViewControllers/StreamFrameViewController.m b/VoidLink/ViewControllers/StreamFrameViewController.m
index dd29d57d..b0f046c2 100644
--- a/VoidLink/ViewControllers/StreamFrameViewController.m
+++ b/VoidLink/ViewControllers/StreamFrameViewController.m
@@ -811,6 +811,8 @@
     [self.navigationController popToRootViewControllerAnimated:NO];
     
     _extWindow = nil;
+    
+    self.mainFrameViewcontroller.settingsExpandedInStreamView = false; // reset this flag to false
 }
 
 // External Screen connected
@@ -957,7 +959,6 @@
 
 - (void)disconnectRemoteSession {
     Log(LOG_I, @"Settings view disconnect the session in stream view");
-    self.mainFrameViewcontroller.settingsExpandedInStreamView = false; // reset this flag to false
     [self returnToMainFrame];
 }