1

Src/Unity/Scripts/UX/RadialMenu/UXRadialMenu.cs

@@ -106,7 +106,15 @@ var button = 	container.Get<Button>();
 
 		protected override void OnReturn()
 		{
-			UXService.Entry(_prevPanel);
+			if (_prevPanel is not null)
+			{
+				UXService.Entry(_prevPanel);
+			}
+			else
+			{
+				UXService.Return();
+			}
+		
 		}
 
 		public void Perform(IHotkeyCollection collection)

Src/Unity/Scripts/UX/Service/UXService.cs

@@ -210,7 +210,7 @@ Object.Destroy(gameObject);
 				}
 				if (_entryQueue.TryPop(out var nextPanel))
 				{
-					if (nextPanel.IsWindow)
+					if (nextPanel is {IsWindow:true})
 					{
 						_windowEntryGroup.TransitionState(nextPanel);
 						return;