From 28c93263055728098abf189949fa3fc8a725f680 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Tue, 11 Jan 2022 04:35:04 +1300
Subject: [PATCH] Move popup above modal in `RootControl` (#2412)

---
 .../UserInterface/UserInterfaceManager.cs          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Robust.Client/UserInterface/UserInterfaceManager.cs b/Robust.Client/UserInterface/UserInterfaceManager.cs
index 52cc5f94d6..791bb0a001 100644
--- a/Robust.Client/UserInterface/UserInterfaceManager.cs
+++ b/Robust.Client/UserInterface/UserInterfaceManager.cs
@@ -164,13 +164,6 @@ namespace Robust.Client.UserInterface
             };
             RootControl.AddChild(WindowRoot);
 
-            PopupRoot = new LayoutContainer
-            {
-                Name = "PopupRoot",
-                MouseFilter = Control.MouseFilterMode.Ignore
-            };
-            RootControl.AddChild(PopupRoot);
-
             ModalRoot = new PopupContainer
             {
                 Name = "ModalRoot",
@@ -178,6 +171,13 @@ namespace Robust.Client.UserInterface
             };
             RootControl.AddChild(ModalRoot);
 
+            PopupRoot = new LayoutContainer
+            {
+                Name = "PopupRoot",
+                MouseFilter = Control.MouseFilterMode.Ignore
+            };
+            RootControl.AddChild(PopupRoot);
+
             _tooltip = new Tooltip();
             PopupRoot.AddChild(_tooltip);
             _tooltip.Visible = false;