diff --git a/Content.Client/Lobby/LobbyState.cs b/Content.Client/Lobby/LobbyState.cs
index 37e4aa4bfe..31ef2d3c8b 100644
--- a/Content.Client/Lobby/LobbyState.cs
+++ b/Content.Client/Lobby/LobbyState.cs
@@ -84,7 +84,6 @@ namespace Content.Client.Lobby
                 _userInterfaceManager.StateRoot.AddChild(_characterSetup);
             };
 
-            _lobby.ObserveButton.OnPressed += _ => _consoleHost.ExecuteCommand("observe");
             _lobby.ReadyButton.OnPressed += _ =>
             {
                 if (!gameTicker.IsGameStarted)
diff --git a/Content.Client/Lobby/UI/LobbyGui.xaml b/Content.Client/Lobby/UI/LobbyGui.xaml
index 09bcf1f5f8..d21526aab6 100644
--- a/Content.Client/Lobby/UI/LobbyGui.xaml
+++ b/Content.Client/Lobby/UI/LobbyGui.xaml
@@ -2,6 +2,7 @@
          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
          xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
          xmlns:maths="clr-namespace:Robust.Shared.Maths;assembly=Robust.Shared.Maths"
+         xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
          xmlns:parallax="clr-namespace:Content.Client.Parallax"
          xmlns:ui="clr-namespace:Content.Client.Voting.UI"
          xmlns:style="clr-namespace:Content.Client.Stylesheets"
@@ -37,7 +38,7 @@
                     <BoxContainer Orientation="Vertical" Name="CLeftPanelContainer" HorizontalExpand="True">
                         <hudUi:StripeBack>
                             <BoxContainer Orientation="Horizontal" SeparationOverride="6" Margin="3 3 3 3">
-                                <Button Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig" />
+                                <cc:UICommandButton Command="observe" Name="CObserveButton" Text="{Loc 'Observe'}" StyleClasses="ButtonBig"  WindowType="{x:Type lobbyUi:ObserveWarningWindow}"/>
                                 <Label Name="CStartTime" Align="Right"
                                        FontColorOverride="{x:Static maths:Color.DarkGray}"
                                        StyleClasses="LabelBig" HorizontalExpand="True" />
diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
new file mode 100644
index 0000000000..1b4d5ba7b3
--- /dev/null
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml
@@ -0,0 +1,13 @@
+<SS14Window
+    xmlns="https://spacestation14.io"
+    xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls">
+    <BoxContainer Orientation="Vertical">
+        <Label Text="{Loc 'observe-warning-1'}"/>
+        <Label Text="{Loc 'observe-warning-2'}"/>
+        <BoxContainer Orientation="Horizontal" >
+            <Button Name="NevermindButton" Text="{Loc 'observe-nevermind'}" SizeFlagsStretchRatio="1"/>
+            <Control HorizontalExpand="True" SizeFlagsStretchRatio="2" />
+            <cc:CommandButton  Command="observe" Name="ObserveButton" StyleClasses="Caution" Text="{Loc 'Observe'}" SizeFlagsStretchRatio="1"/>
+        </BoxContainer>
+    </BoxContainer>
+</SS14Window>
diff --git a/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
new file mode 100644
index 0000000000..b1dd558206
--- /dev/null
+++ b/Content.Client/Lobby/UI/ObserveWarningWindow.xaml.cs
@@ -0,0 +1,24 @@
+using JetBrains.Annotations;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.IoC;
+using Robust.Shared.Localization;
+
+namespace Content.Client.Lobby.UI
+{
+    [GenerateTypedNameReferences]
+    [UsedImplicitly]
+    internal sealed partial class ObserveWarningWindow : SS14Window
+    {
+        public ObserveWarningWindow()
+        {
+            Title = Loc.GetString("observe-warning-window-title");
+            RobustXamlLoader.Load(this);
+            IoCManager.InjectDependencies(this);
+
+            ObserveButton.OnPressed += _ => { this.Close(); };
+            NevermindButton.OnPressed += _ => { this.Close(); };
+        }
+    }
+}
diff --git a/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl b/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl
new file mode 100644
index 0000000000..b9b001d06b
--- /dev/null
+++ b/Resources/Locale/en-US/lobby/ui/observe-warning-window.ftl
@@ -0,0 +1,4 @@
+observe-nevermind = Nevermind
+observe-warning-1 = Are you sure you want to observe?
+observe-warning-2 = You cannot play in the round if you do so.
+observe-warning-window-title = Warning