diff --git a/VoidLink/Input/ControllerNavigator.swift b/VoidLink/Input/ControllerNavigator.swift
index da8e76be..216487ff 100644
--- a/VoidLink/Input/ControllerNavigator.swift
+++ b/VoidLink/Input/ControllerNavigator.swift
@@ -778,7 +778,7 @@ final class ControllerNavigator: NSObject {
                 radialMenuButtonPressed = false
                 radialMenuDelayTimer?.clean()
                 stickReleasedInRadialMenu = false
-                if radialMenuView == nil, uiNavigationDelegate is StreamFrameViewController {
+                if radialMenuView == nil, let vc = uiNavigationDelegate as? StreamFrameViewController, vc.hasNoPresentedVC {
                     ControllerSupport.sharedInstance()?.sendNavigationButtonPress()
                     return
                 }
diff --git a/VoidLink/ViewControllers/MainFrameViewController.m b/VoidLink/ViewControllers/MainFrameViewController.m
index 0cd94fa7..b49165f1 100644
--- a/VoidLink/ViewControllers/MainFrameViewController.m
+++ b/VoidLink/ViewControllers/MainFrameViewController.m
@@ -2813,7 +2813,8 @@ static NSMutableSet* hostList;
     dispatch_async(dispatch_get_main_queue(), ^{
         switch (item) {
             case RadialMenuItemSettings:
-                [[self revealViewController] revealToggleAnimated:YES];
+                if(self.isStreaming && !self.settingsViewExpanded) [self->streamFrameViewController expandSettingsView];
+                else [[self revealViewController] revealToggleAnimated:YES];
                 break;
             case RadialMenuItemAllSettings:
                 [self.revealViewController allSettingSelected];