From 5e0aafa7259e7680da37801fc21f3e04293805ed Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 14 Jun 2026 23:55:10 +0200
Subject: [PATCH 1/3] Feature: Remote Desktop - View Only mode

---
 .../Resources/Strings.Designer.cs             |  20 ++-
 .../Resources/Strings.resx                    |   6 +
 .../RemoteDesktop/RemoteDesktopSessionInfo.cs |   4 +
 .../Application/RemoteDesktop.cs              |   9 ++
 Source/NETworkManager.Profiles/GroupInfo.cs   |   4 +
 Source/NETworkManager.Profiles/ProfileInfo.cs |   4 +
 .../GlobalStaticConfiguration.cs              |   1 +
 .../NETworkManager.Settings/SettingsInfo.cs   |  13 ++
 .../Controls/DragablzTabHostWindow.xaml       |  51 ++++++-
 .../Controls/DragablzTabHostWindow.xaml.cs    |  22 ++-
 .../Controls/RemoteDesktopControl.xaml.cs     |  65 +++++++++
 Source/NETworkManager/ProfileDialogManager.cs |   4 +
 .../ViewModels/GroupViewModel.cs              |  28 ++++
 .../ViewModels/ProfileViewModel.cs            |  28 ++++
 .../RemoteDesktopConnectViewModel.cs          |  17 ++-
 .../ViewModels/RemoteDesktopHostViewModel.cs  |  27 +++-
 .../RemoteDesktopSettingsViewModel.cs         |  17 +++
 .../Views/GroupChildWindow.xaml               | 127 ++++++++++--------
 .../Views/ProfileChildWindow.xaml             | 125 +++++++++--------
 .../RemoteDesktopConnectChildWindow.xaml      |   4 +
 .../Views/RemoteDesktopHostView.xaml          |  43 +++++-
 .../Views/RemoteDesktopSettingsView.xaml      |   3 +
 Website/docs/application/remote-desktop.md    |  39 +++++-
 Website/docs/changelog/next-release.md        |   4 +
 24 files changed, 533 insertions(+), 132 deletions(-)

diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
index a6e70ad0e0..9ddb2ab8bf 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
+++ b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
@@ -12279,7 +12279,25 @@ public static string VisualStyles {
                 return ResourceManager.GetString("VisualStyles", resourceCulture);
             }
         }
-        
+
+        /// <summary>
+        ///   Looks up a localized string similar to View only.
+        /// </summary>
+        public static string ViewOnly {
+            get {
+                return ResourceManager.GetString("ViewOnly", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Block keyboard and mouse input to the remote session.
+        /// </summary>
+        public static string ViewOnlyDescription {
+            get {
+                return ResourceManager.GetString("ViewOnlyDescription", resourceCulture);
+            }
+        }
+
         /// <summary>
         ///   Looks up a localized string similar to VLAN.
         /// </summary>
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
index 28fe9f6281..5f30429e61 100644
--- a/Source/NETworkManager.Localization/Resources/Strings.resx
+++ b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -2142,6 +2142,12 @@ is disabled!</value>
   <data name="VisualStyles" xml:space="preserve">
     <value>Visual styles</value>
   </data>
+  <data name="ViewOnly" xml:space="preserve">
+    <value>View only</value>
+  </data>
+  <data name="ViewOnlyDescription" xml:space="preserve">
+    <value>Block keyboard and mouse input to the remote session</value>
+  </data>
   <data name="RemoteAudio" xml:space="preserve">
     <value>Remote audio</value>
   </data>
diff --git a/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs b/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs
index 106a19b7be..965a5abfa7 100644
--- a/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs
+++ b/Source/NETworkManager.Models/RemoteDesktop/RemoteDesktopSessionInfo.cs
@@ -16,6 +16,10 @@ public class RemoteDesktopSessionInfo
     public int DesktopWidth { get; set; }
     public int DesktopHeight { get; set; }
     public int ColorDepth { get; set; }
+
+    // View only (block keyboard and mouse input to the remote session)
+    public bool ViewOnly { get; set; }
+
     public bool EnableCredSspSupport { get; set; }
     public uint AuthenticationLevel { get; set; }
     public bool EnableGatewayServer { get; set; }
diff --git a/Source/NETworkManager.Profiles/Application/RemoteDesktop.cs b/Source/NETworkManager.Profiles/Application/RemoteDesktop.cs
index c8240d2a3f..304dfdd75f 100644
--- a/Source/NETworkManager.Profiles/Application/RemoteDesktop.cs
+++ b/Source/NETworkManager.Profiles/Application/RemoteDesktop.cs
@@ -26,6 +26,9 @@ public static RemoteDesktopSessionInfo CreateSessionInfo()
                 : SettingsManager.Current.RemoteDesktop_ScreenHeight,
             ColorDepth = SettingsManager.Current.RemoteDesktop_ColorDepth,
 
+            // View only
+            ViewOnly = SettingsManager.Current.RemoteDesktop_ViewOnly,
+
             // Authentication
             EnableCredSspSupport = SettingsManager.Current.RemoteDesktop_EnableCredSspSupport,
             AuthenticationLevel = SettingsManager.Current.RemoteDesktop_AuthenticationLevel,
@@ -128,6 +131,12 @@ public static RemoteDesktopSessionInfo CreateSessionInfo(ProfileInfo profile)
             info.ColorDepth = group.RemoteDesktop_ColorDepth;
         }
 
+        // View only
+        if (profile.RemoteDesktop_OverrideViewOnly)
+            info.ViewOnly = profile.RemoteDesktop_ViewOnly;
+        else if (group.RemoteDesktop_OverrideViewOnly)
+            info.ViewOnly = group.RemoteDesktop_ViewOnly;
+
         // Authentication
         if (profile.RemoteDesktop_OverrideCredSspSupport)
             info.EnableCredSspSupport = profile.RemoteDesktop_EnableCredSspSupport;
diff --git a/Source/NETworkManager.Profiles/GroupInfo.cs b/Source/NETworkManager.Profiles/GroupInfo.cs
index 2598a48d05..4842bcccc2 100644
--- a/Source/NETworkManager.Profiles/GroupInfo.cs
+++ b/Source/NETworkManager.Profiles/GroupInfo.cs
@@ -60,6 +60,8 @@ public GroupInfo(GroupInfo group) : this(group.Name)
         RemoteDesktop_ColorDepth = group.RemoteDesktop_ColorDepth;
         RemoteDesktop_OverridePort = group.RemoteDesktop_OverridePort;
         RemoteDesktop_Port = group.RemoteDesktop_Port;
+        RemoteDesktop_OverrideViewOnly = group.RemoteDesktop_OverrideViewOnly;
+        RemoteDesktop_ViewOnly = group.RemoteDesktop_ViewOnly;
         RemoteDesktop_OverrideCredSspSupport = group.RemoteDesktop_OverrideCredSspSupport;
         RemoteDesktop_EnableCredSspSupport = group.RemoteDesktop_EnableCredSspSupport;
         RemoteDesktop_OverrideAuthenticationLevel = group.RemoteDesktop_OverrideAuthenticationLevel;
@@ -196,6 +198,8 @@ public GroupInfo(GroupInfo group) : this(group.Name)
     public int RemoteDesktop_ColorDepth { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ColorDepth;
     public bool RemoteDesktop_OverridePort { get; set; }
     public int RemoteDesktop_Port { get; set; } = GlobalStaticConfiguration.RemoteDesktop_Port;
+    public bool RemoteDesktop_OverrideViewOnly { get; set; }
+    public bool RemoteDesktop_ViewOnly { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ViewOnly;
     public bool RemoteDesktop_OverrideCredSspSupport { get; set; }
     public bool RemoteDesktop_EnableCredSspSupport { get; set; }
     public bool RemoteDesktop_OverrideAuthenticationLevel { get; set; }
diff --git a/Source/NETworkManager.Profiles/ProfileInfo.cs b/Source/NETworkManager.Profiles/ProfileInfo.cs
index 877d9c472f..3b36201016 100644
--- a/Source/NETworkManager.Profiles/ProfileInfo.cs
+++ b/Source/NETworkManager.Profiles/ProfileInfo.cs
@@ -100,6 +100,8 @@ public ProfileInfo(ProfileInfo profile)
         RemoteDesktop_ColorDepth = profile.RemoteDesktop_ColorDepth;
         RemoteDesktop_OverridePort = profile.RemoteDesktop_OverridePort;
         RemoteDesktop_Port = profile.RemoteDesktop_Port;
+        RemoteDesktop_OverrideViewOnly = profile.RemoteDesktop_OverrideViewOnly;
+        RemoteDesktop_ViewOnly = profile.RemoteDesktop_ViewOnly;
         RemoteDesktop_OverrideCredSspSupport = profile.RemoteDesktop_OverrideCredSspSupport;
         RemoteDesktop_EnableCredSspSupport = profile.RemoteDesktop_EnableCredSspSupport;
         RemoteDesktop_OverrideAuthenticationLevel = profile.RemoteDesktop_OverrideAuthenticationLevel;
@@ -345,6 +347,8 @@ public ProfileInfo(ProfileInfo profile)
     public int RemoteDesktop_ColorDepth { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ColorDepth;
     public bool RemoteDesktop_OverridePort { get; set; }
     public int RemoteDesktop_Port { get; set; } = GlobalStaticConfiguration.RemoteDesktop_Port;
+    public bool RemoteDesktop_OverrideViewOnly { get; set; }
+    public bool RemoteDesktop_ViewOnly { get; set; } = GlobalStaticConfiguration.RemoteDesktop_ViewOnly;
     public bool RemoteDesktop_OverrideCredSspSupport { get; set; }
     public bool RemoteDesktop_EnableCredSspSupport { get; set; }
     public bool RemoteDesktop_OverrideAuthenticationLevel { get; set; }
diff --git a/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs b/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
index ee66caad44..2d4c40b93f 100644
--- a/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
+++ b/Source/NETworkManager.Settings/GlobalStaticConfiguration.cs
@@ -182,6 +182,7 @@ public static class GlobalStaticConfiguration
 
     public static int RemoteDesktop_ColorDepth => 32;
     public static int RemoteDesktop_Port => 3389;
+    public static bool RemoteDesktop_ViewOnly => false;
     public static bool RemoteDesktop_GatewayServerBypassLocalAddresses => true;
 
     public static GatewayUserSelectedCredsSource RemoteDesktop_GatewayServerLogonMethod =>
diff --git a/Source/NETworkManager.Settings/SettingsInfo.cs b/Source/NETworkManager.Settings/SettingsInfo.cs
index 1a739e5724..dac5457ea4 100644
--- a/Source/NETworkManager.Settings/SettingsInfo.cs
+++ b/Source/NETworkManager.Settings/SettingsInfo.cs
@@ -2175,6 +2175,19 @@ public int RemoteDesktop_Port
         }
     } = GlobalStaticConfiguration.RemoteDesktop_Port;
 
+    public bool RemoteDesktop_ViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    } = GlobalStaticConfiguration.RemoteDesktop_ViewOnly;
+
     public bool RemoteDesktop_EnableCredSspSupport
     {
         get;
diff --git a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
index a60f681974..784a51eae7 100644
--- a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
+++ b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml
@@ -8,6 +8,7 @@
                  xmlns:dockablz="clr-namespace:Dragablz.Dockablz;assembly=Dragablz"
                  xmlns:localization="clr-namespace:NETworkManager.Localization.Resources;assembly=NETworkManager.Localization"
                  xmlns:controls="clr-namespace:NETworkManager.Controls"
+                 xmlns:converters="clr-namespace:NETworkManager.Converters;assembly=NETworkManager.Converters"
                  xmlns:application="clr-namespace:NETworkManager.Models;assembly=NETworkManager.Models"
                  xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
                  xmlns:wpfHelpers="clr-namespace:NETworkManager.Utilities.WPF;assembly=NETworkManager.Utilities.WPF"                 
@@ -18,6 +19,8 @@
                  d:DataContext="{d:DesignInstance controls:DragablzTabHostWindow}">
     <mah:MetroWindow.Resources>
         <wpfHelpers:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
+        <converters:BooleanToVisibilityCollapsedConverter x:Key="BooleanToVisibilityCollapsedConverter" />
+        <converters:BooleanReverseToVisibilityCollapsedConverter x:Key="BooleanReverseToVisibilityCollapsedConverter" />
     </mah:MetroWindow.Resources>
     <mah:MetroWindow.WindowButtonCommands>
         <mah:WindowButtonCommands Template="{DynamicResource MahApps.Templates.WindowButtonCommands.Win10}" />
@@ -53,7 +56,8 @@
                                                             <MenuItem
                                                                 Header="{x:Static localization:Strings.Reconnect}"
                                                                 Command="{Binding Data.RemoteDesktop_ReconnectCommand, Source={StaticResource BindingProxy}}"
-                                                                CommandParameter="{Binding View}">
+                                                                CommandParameter="{Binding View}"
+                                                                Visibility="{Binding View.IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
                                                                 <MenuItem.Icon>
                                                                     <Rectangle Width="16" Height="16"
                                                                                Fill="{DynamicResource MahApps.Brushes.Gray3}">
@@ -67,7 +71,8 @@
                                                             <MenuItem
                                                                 Header="{x:Static localization:Strings.Disconnect}"
                                                                 Command="{Binding Data.RemoteDesktop_DisconnectCommand, Source={StaticResource BindingProxy}}"
-                                                                CommandParameter="{Binding View}">
+                                                                CommandParameter="{Binding View}"
+                                                                Visibility="{Binding View.IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                                                 <MenuItem.Icon>
                                                                     <Rectangle Width="16" Height="16"
                                                                                Fill="{DynamicResource MahApps.Brushes.Gray3}">
@@ -107,6 +112,38 @@
                                                                     </Rectangle>
                                                                 </MenuItem.Icon>
                                                             </MenuItem>
+                                                            <MenuItem
+                                                                Header="{x:Static localization:Strings.ViewOnly}"
+                                                                Command="{Binding Data.RemoteDesktop_ViewOnlyCommand, Source={StaticResource BindingProxy}}"
+                                                                CommandParameter="{Binding View}">
+                                                                <MenuItem.Icon>
+                                                                    <Rectangle Width="16" Height="16"
+                                                                               Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                                                                        <Rectangle.Resources>
+                                                                            <VisualBrush x:Key="VisualEye"
+                                                                                Stretch="Uniform"
+                                                                                Visual="{iconPacks:Material Kind=Eye}" />
+                                                                            <VisualBrush x:Key="VisualEyeOff"
+                                                                                Stretch="Uniform"
+                                                                                Visual="{iconPacks:Material Kind=EyeOff}" />
+                                                                        </Rectangle.Resources>
+                                                                        <Rectangle.Style>
+                                                                            <Style TargetType="{x:Type Rectangle}">
+                                                                                <Setter Property="OpacityMask"
+                                                                                    Value="{StaticResource VisualEyeOff}" />
+                                                                                <Style.Triggers>
+                                                                                    <DataTrigger
+                                                                                        Binding="{Binding View.IsViewOnly}"
+                                                                                        Value="True">
+                                                                                        <Setter Property="OpacityMask"
+                                                                                            Value="{StaticResource VisualEye}" />
+                                                                                    </DataTrigger>
+                                                                                </Style.Triggers>
+                                                                            </Style>
+                                                                        </Rectangle.Style>
+                                                                    </Rectangle>
+                                                                </MenuItem.Icon>
+                                                            </MenuItem>
                                                             <Separator />
                                                             <MenuItem
                                                                 Header="{x:Static localization:Strings.KeyboardShortcuts}">
@@ -160,6 +197,16 @@
                                                             <Thumb Style="{DynamicResource InvisibleThumbStyle}"
                                                                    dragablz:DragablzItem.IsCustomThumb="True" />
                                                         </Grid>
+                                                        <Rectangle Width="16" Height="16" Margin="0,0,10,0"
+                                                                   VerticalAlignment="Center"
+                                                                   Fill="{DynamicResource MahApps.Brushes.Gray3}"
+                                                                   ToolTip="{x:Static localization:Strings.ViewOnly}"
+                                                                   Visibility="{Binding View.IsViewOnly, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                                            <Rectangle.OpacityMask>
+                                                                <VisualBrush Stretch="Uniform"
+                                                                    Visual="{iconPacks:Material Kind=Eye}" />
+                                                            </Rectangle.OpacityMask>
+                                                        </Rectangle>
                                                         <Button Style="{StaticResource CleanButton}"
                                                                 Command="dragablz:TabablzControl.CloseItemCommand"
                                                                 ToolTip="{x:Static localization:Strings.Close}"
diff --git a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs
index a3cad44cdd..a98b7233ac 100644
--- a/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs
+++ b/Source/NETworkManager/Controls/DragablzTabHostWindow.xaml.cs
@@ -165,6 +165,15 @@ private bool RemoteDesktop_IsDisconnected_CanExecute(object view)
         return false;
     }
 
+    // Used to block actions that would bypass view-only mode (e.g. fullscreen, Ctrl+Alt+Del).
+    private bool RemoteDesktop_IsConnectedAndNotViewOnly_CanExecute(object view)
+    {
+        if (view is RemoteDesktopControl control)
+            return control.IsConnected && !control.IsViewOnly;
+
+        return false;
+    }
+
     public ICommand RemoteDesktop_DisconnectCommand =>
         new RelayCommand(RemoteDesktop_DisconnectAction, RemoteDesktop_IsConnected_CanExecute);
 
@@ -186,7 +195,7 @@ private void RemoteDesktop_ReconnectAction(object view)
     }
 
     public ICommand RemoteDesktop_FullscreenCommand =>
-        new RelayCommand(RemoteDesktop_FullscreenAction, RemoteDesktop_IsConnected_CanExecute);
+        new RelayCommand(RemoteDesktop_FullscreenAction, RemoteDesktop_IsConnectedAndNotViewOnly_CanExecute);
 
     private void RemoteDesktop_FullscreenAction(object view)
     {
@@ -194,6 +203,15 @@ private void RemoteDesktop_FullscreenAction(object view)
             control.FullScreen();
     }
 
+    public ICommand RemoteDesktop_ViewOnlyCommand =>
+        new RelayCommand(RemoteDesktop_ViewOnlyAction, RemoteDesktop_IsConnected_CanExecute);
+
+    private void RemoteDesktop_ViewOnlyAction(object view)
+    {
+        if (view is RemoteDesktopControl control)
+            control.ToggleViewOnly();
+    }
+
     public ICommand RemoteDesktop_AdjustScreenCommand =>
         new RelayCommand(RemoteDesktop_AdjustScreenAction, RemoteDesktop_IsConnected_CanExecute);
 
@@ -204,7 +222,7 @@ private void RemoteDesktop_AdjustScreenAction(object view)
     }
 
     public ICommand RemoteDesktop_SendCtrlAltDelCommand =>
-        new RelayCommand(RemoteDesktop_SendCtrlAltDelAction, RemoteDesktop_IsConnected_CanExecute);
+        new RelayCommand(RemoteDesktop_SendCtrlAltDelAction, RemoteDesktop_IsConnectedAndNotViewOnly_CanExecute);
 
     private async void RemoteDesktop_SendCtrlAltDelAction(object view)
     {
diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
index 3bc4548a93..16118c7129 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -90,6 +90,19 @@ private set
         }
     }
 
+    public bool IsViewOnly
+    {
+        get;
+        private set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     #endregion
 
     #region Constructor, load
@@ -103,6 +116,9 @@ public RemoteDesktopControl(Guid tabId, RemoteDesktopSessionInfo sessionInfo)
         _tabId = tabId;
         _sessionInfo = sessionInfo;
 
+        // Seed the initial view-only state from the session settings (applied on connect).
+        IsViewOnly = sessionInfo.ViewOnly;
+
         Dispatcher.ShutdownStarted += Dispatcher_ShutdownStarted;
     }
 
@@ -495,6 +511,51 @@ public void SendKey(Keystroke keystroke)
         ocx.SendKeys(info.KeyData.Length, info.ArrayKeyUp, info.KeyData);
     }
 
+    /// <summary>
+    /// Toggle view-only mode on or off.
+    /// </summary>
+    public void ToggleViewOnly()
+    {
+        SetViewOnly(!IsViewOnly);
+    }
+
+    /// <summary>
+    /// Enable or disable view-only mode, which blocks keyboard and mouse input to the
+    /// remote session while the screen keeps updating.
+    /// </summary>
+    /// <param name="viewOnly">Whether view-only mode should be enabled.</param>
+    public void SetViewOnly(bool viewOnly)
+    {
+        IsViewOnly = viewOnly;
+
+        ApplyViewOnly();
+    }
+
+    /// <summary>
+    /// Apply the current <see cref="IsViewOnly" /> state to the RDP control. Called when the
+    /// mode is toggled and after each (re)connect so the state survives a reconnect.
+    /// </summary>
+    private void ApplyViewOnly()
+    {
+        // Disabling the control (EnableWindow) blocks the mouse, but the inner RDP input
+        // window keeps the keyboard focus it already had, so keystrokes still get through.
+        RdpClient.Enabled = !IsViewOnly;
+
+        if (IsViewOnly)
+        {
+            // Pull keyboard focus away from the RDP session. A disabled control is not a tab
+            // stop and can't be clicked, so the focus cannot return until view-only is off.
+            Focusable = true;
+            Keyboard.ClearFocus();
+            Focus();
+        }
+        else
+        {
+            // Hand input back to the session.
+            RdpClient.Focus();
+        }
+    }
+
     /// <summary>
     /// Disconnect the RDP session.
     /// </summary>
@@ -699,6 +760,10 @@ private void RdpClient_OnConnected(object sender, EventArgs e)
     {
         IsConnected = true;
         IsConnecting = false;
+
+        // (Re)apply view-only mode if it is active for this session.
+        if (IsViewOnly)
+            ApplyViewOnly();
     }
 
     private void RdpClient_OnDisconnected(object sender, IMsTscAxEvents_OnDisconnectedEvent e)
diff --git a/Source/NETworkManager/ProfileDialogManager.cs b/Source/NETworkManager/ProfileDialogManager.cs
index 86f35ffeec..f8ed376705 100644
--- a/Source/NETworkManager/ProfileDialogManager.cs
+++ b/Source/NETworkManager/ProfileDialogManager.cs
@@ -106,6 +106,8 @@ private static ProfileInfo ParseProfileInfo(ProfileViewModel instance)
             RemoteDesktop_ColorDepth = instance.RemoteDesktop_SelectedColorDepth,
             RemoteDesktop_OverridePort = instance.RemoteDesktop_OverridePort,
             RemoteDesktop_Port = instance.RemoteDesktop_Port,
+            RemoteDesktop_OverrideViewOnly = instance.RemoteDesktop_OverrideViewOnly,
+            RemoteDesktop_ViewOnly = instance.RemoteDesktop_ViewOnly,
             RemoteDesktop_OverrideCredSspSupport = instance.RemoteDesktop_OverrideCredSspSupport,
             RemoteDesktop_EnableCredSspSupport = instance.RemoteDesktop_EnableCredSspSupport,
             RemoteDesktop_OverrideAuthenticationLevel = instance.RemoteDesktop_OverrideAuthenticationLevel,
@@ -328,6 +330,8 @@ private static GroupInfo ParseGroupInfo(GroupViewModel instance)
             RemoteDesktop_ColorDepth = instance.RemoteDesktop_SelectedColorDepth,
             RemoteDesktop_OverridePort = instance.RemoteDesktop_OverridePort,
             RemoteDesktop_Port = instance.RemoteDesktop_Port,
+            RemoteDesktop_OverrideViewOnly = instance.RemoteDesktop_OverrideViewOnly,
+            RemoteDesktop_ViewOnly = instance.RemoteDesktop_ViewOnly,
             RemoteDesktop_OverrideCredSspSupport = instance.RemoteDesktop_OverrideCredSspSupport,
             RemoteDesktop_EnableCredSspSupport = instance.RemoteDesktop_EnableCredSspSupport,
             RemoteDesktop_OverrideAuthenticationLevel = instance.RemoteDesktop_OverrideAuthenticationLevel,
diff --git a/Source/NETworkManager/ViewModels/GroupViewModel.cs b/Source/NETworkManager/ViewModels/GroupViewModel.cs
index 7b7f121019..a3debe5d79 100644
--- a/Source/NETworkManager/ViewModels/GroupViewModel.cs
+++ b/Source/NETworkManager/ViewModels/GroupViewModel.cs
@@ -368,6 +368,32 @@ public int RemoteDesktop_Port
         }
     }
 
+    public bool RemoteDesktop_OverrideViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public bool RemoteDesktop_ViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     public bool RemoteDesktop_OverrideCredSspSupport
     {
         get;
@@ -1584,6 +1610,8 @@ public GroupViewModel(Action<GroupViewModel> saveCommand, Action<GroupViewModel>
             RemoteDesktop_ColorDepths.FirstOrDefault(x => x == groupInfo.RemoteDesktop_ColorDepth);
         RemoteDesktop_OverridePort = groupInfo.RemoteDesktop_OverridePort;
         RemoteDesktop_Port = groupInfo.RemoteDesktop_Port;
+        RemoteDesktop_OverrideViewOnly = groupInfo.RemoteDesktop_OverrideViewOnly;
+        RemoteDesktop_ViewOnly = groupInfo.RemoteDesktop_ViewOnly;
         RemoteDesktop_OverrideCredSspSupport = groupInfo.RemoteDesktop_OverrideCredSspSupport;
         RemoteDesktop_EnableCredSspSupport = groupInfo.RemoteDesktop_EnableCredSspSupport;
         RemoteDesktop_OverrideAuthenticationLevel = groupInfo.RemoteDesktop_OverrideAuthenticationLevel;
diff --git a/Source/NETworkManager/ViewModels/ProfileViewModel.cs b/Source/NETworkManager/ViewModels/ProfileViewModel.cs
index dacde82a25..29b84def39 100644
--- a/Source/NETworkManager/ViewModels/ProfileViewModel.cs
+++ b/Source/NETworkManager/ViewModels/ProfileViewModel.cs
@@ -136,6 +136,8 @@ public ProfileViewModel(Action<ProfileViewModel> saveCommand, Action<ProfileView
             RemoteDesktop_ColorDepths.FirstOrDefault(x => x == profileInfo.RemoteDesktop_ColorDepth);
         RemoteDesktop_OverridePort = profileInfo.RemoteDesktop_OverridePort;
         RemoteDesktop_Port = profileInfo.RemoteDesktop_Port;
+        RemoteDesktop_OverrideViewOnly = profileInfo.RemoteDesktop_OverrideViewOnly;
+        RemoteDesktop_ViewOnly = profileInfo.RemoteDesktop_ViewOnly;
         RemoteDesktop_OverrideCredSspSupport = profileInfo.RemoteDesktop_OverrideCredSspSupport;
         RemoteDesktop_EnableCredSspSupport = profileInfo.RemoteDesktop_EnableCredSspSupport;
         RemoteDesktop_OverrideAuthenticationLevel = profileInfo.RemoteDesktop_OverrideAuthenticationLevel;
@@ -1167,6 +1169,32 @@ public int RemoteDesktop_Port
         }
     }
 
+    public bool RemoteDesktop_OverrideViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
+    public bool RemoteDesktop_ViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     public bool RemoteDesktop_OverrideCredSspSupport
     {
         get;
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs
index 0fbd66483b..a986e969cc 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopConnectViewModel.cs
@@ -134,12 +134,26 @@ public bool AdminSession
         }
     }
 
+    public bool ViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    } = SettingsManager.Current.RemoteDesktop_ViewOnly;
+
     #endregion
 
     #region Constructor
 
     public RemoteDesktopConnectViewModel(Action<RemoteDesktopConnectViewModel> connectCommand,
-        Action<RemoteDesktopConnectViewModel> cancelHandler, (string Name, string Host, bool AdminSession)? connectAsOptions = null)
+        Action<RemoteDesktopConnectViewModel> cancelHandler,
+        (string Name, string Host, bool AdminSession, bool ViewOnly)? connectAsOptions = null)
     {
         ConnectCommand = new RelayCommand(_ => connectCommand(this));
         CancelCommand = new RelayCommand(_ => cancelHandler(this));
@@ -158,6 +172,7 @@ public RemoteDesktopConnectViewModel(Action<RemoteDesktopConnectViewModel> conne
             Host = connectAsOptions.Value.Host;
 
             AdminSession = connectAsOptions.Value.AdminSession;
+            ViewOnly = connectAsOptions.Value.ViewOnly;
         }
     }
 
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
index aeadde6120..7906161cc2 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs
@@ -299,6 +299,15 @@ private bool IsDisconnected_CanExecute(object view)
         return false;
     }
 
+    // Used to block actions that would bypass view-only mode (e.g. fullscreen, Ctrl+Alt+Del).
+    private bool IsConnectedAndNotViewOnly_CanExecute(object view)
+    {
+        if (view is RemoteDesktopControl control)
+            return control.IsConnected && !control.IsViewOnly;
+
+        return false;
+    }
+
     public ICommand ReconnectCommand => new RelayCommand(ReconnectAction, IsDisconnected_CanExecute);
 
     private void ReconnectAction(object view)
@@ -317,7 +326,7 @@ private void DisconnectAction(object view)
                 control.DisconnectCommand.Execute(null);
     }
 
-    public ICommand FullscreenCommand => new RelayCommand(FullscreenAction, IsConnected_CanExecute);
+    public ICommand FullscreenCommand => new RelayCommand(FullscreenAction, IsConnectedAndNotViewOnly_CanExecute);
 
     private void FullscreenAction(object view)
     {
@@ -325,6 +334,14 @@ private void FullscreenAction(object view)
             control.FullScreen();
     }
 
+    public ICommand ViewOnlyCommand => new RelayCommand(ViewOnlyAction, IsConnected_CanExecute);
+
+    private void ViewOnlyAction(object view)
+    {
+        if (view is RemoteDesktopControl control)
+            control.ToggleViewOnly();
+    }
+
     public ICommand AdjustScreenCommand => new RelayCommand(AdjustScreenAction, IsConnected_CanExecute);
 
     private void AdjustScreenAction(object view)
@@ -333,7 +350,8 @@ private void AdjustScreenAction(object view)
             control.AdjustScreen(force: true);
     }
 
-    public ICommand SendCtrlAltDelCommand => new RelayCommand(SendCtrlAltDelAction, IsConnected_CanExecute);
+    public ICommand SendCtrlAltDelCommand =>
+        new RelayCommand(SendCtrlAltDelAction, IsConnectedAndNotViewOnly_CanExecute);
 
     private async void SendCtrlAltDelAction(object view)
     {
@@ -525,6 +543,7 @@ private Task Connect(string host = null)
             }
 
             sessionInfo.AdminSession = instance.AdminSession;
+            sessionInfo.ViewOnly = instance.ViewOnly;
 
             // Add to history
             // Note: The history can only be updated after the values have been read.
@@ -590,6 +609,7 @@ private Task ConnectProfileAs()
             }
 
             sessionInfo.AdminSession = instance.AdminSession;
+            sessionInfo.ViewOnly = instance.ViewOnly;
 
             Connect(sessionInfo, instance.Name);
         }, _ =>
@@ -602,7 +622,8 @@ private Task ConnectProfileAs()
         (
             profileInfo.Name,
             profileInfo.RemoteDesktop_Host,
-            profileInfo.RemoteDesktop_AdminSession
+            profileInfo.RemoteDesktop_AdminSession,
+            sessionInfo.ViewOnly
         ));
 
         childWindow.Title = Strings.ConnectAs;
diff --git a/Source/NETworkManager/ViewModels/RemoteDesktopSettingsViewModel.cs b/Source/NETworkManager/ViewModels/RemoteDesktopSettingsViewModel.cs
index d954e5f6ef..38edf3780a 100644
--- a/Source/NETworkManager/ViewModels/RemoteDesktopSettingsViewModel.cs
+++ b/Source/NETworkManager/ViewModels/RemoteDesktopSettingsViewModel.cs
@@ -210,6 +210,22 @@ public int Port
         }
     }
 
+    public bool ViewOnly
+    {
+        get;
+        set
+        {
+            if (value == field)
+                return;
+
+            if (!_isLoading)
+                SettingsManager.Current.RemoteDesktop_ViewOnly = value;
+
+            field = value;
+            OnPropertyChanged();
+        }
+    }
+
     public bool EnableCredSspSupport
     {
         get;
@@ -654,6 +670,7 @@ private void LoadSettings()
         CustomScreenHeight = SettingsManager.Current.RemoteDesktop_CustomScreenHeight.ToString();
         SelectedColorDepth = ColorDepths.FirstOrDefault(x => x == SettingsManager.Current.RemoteDesktop_ColorDepth);
         Port = SettingsManager.Current.RemoteDesktop_Port;
+        ViewOnly = SettingsManager.Current.RemoteDesktop_ViewOnly;
         EnableCredSspSupport = SettingsManager.Current.RemoteDesktop_EnableCredSspSupport;
         AuthenticationLevel = SettingsManager.Current.RemoteDesktop_AuthenticationLevel;
         EnableGatewayServer = SettingsManager.Current.RemoteDesktop_EnableGatewayServer;
diff --git a/Source/NETworkManager/Views/GroupChildWindow.xaml b/Source/NETworkManager/Views/GroupChildWindow.xaml
index ddc430f627..0fc75ff188 100644
--- a/Source/NETworkManager/Views/GroupChildWindow.xaml
+++ b/Source/NETworkManager/Views/GroupChildWindow.xaml
@@ -717,6 +717,8 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="10" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="10" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="1*" />
@@ -897,39 +899,46 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <CheckBox Grid.Column="0" Grid.Row="20"
+                                          Content="{x:Static localization:Strings.ViewOnly}"
+                                          IsChecked="{Binding RemoteDesktop_OverrideViewOnly}"
+                                          Style="{StaticResource DefaultCheckBox}" />
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="20" OffContent="" OnContent=""
+                                                  IsOn="{Binding RemoteDesktop_ViewOnly}"
+                                                  IsEnabled="{Binding RemoteDesktop_OverrideViewOnly}" />
+                                <CheckBox Grid.Column="0" Grid.Row="22"
                                           Content="{x:Static localization:Strings.CredentialSecuritySupportProvider}"
                                           IsChecked="{Binding RemoteDesktop_OverrideCredSspSupport}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="20" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="22" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableCredSspSupport}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideCredSspSupport}" />
-                                <CheckBox Grid.Column="0" Grid.Row="20"
+                                <CheckBox Grid.Column="0" Grid.Row="24"
                                           Content="{x:Static localization:Strings.AuthenticationLevel}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAuthenticationLevel}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:NumericUpDown Grid.Column="2" Grid.Row="22"
+                                <mah:NumericUpDown Grid.Column="2" Grid.Row="24"
                                                    Value="{Binding RemoteDesktop_AuthenticationLevel}" Maximum="3"
                                                    Minimum="0" Interval="1"
                                                    IsEnabled="{Binding RemoteDesktop_OverrideAuthenticationLevel}" />
-                                <Rectangle Grid.Column="3" Grid.Row="22" Width="24" Height="24"
+                                <Rectangle Grid.Column="3" Grid.Row="24" Width="24" Height="24"
                                            ToolTip="{x:Static localization:Strings.HelpMessage_RDPAuthenticationLevel}"
                                            Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
                                     <Rectangle.Resources>
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="24"
+                                <CheckBox Grid.Column="0" Grid.Row="26"
                                           Content="{x:Static localization:Strings.EnableGatewayServer}"
                                           IsChecked="{Binding RemoteDesktop_OverrideGatewayServer}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="24" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="26" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableGatewayServer}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideGatewayServer}" />
-                                <TextBlock Grid.Column="0" Grid.Row="26"
+                                <TextBlock Grid.Column="0" Grid.Row="28"
                                            Text="{x:Static localization:Strings.ServerName}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
                                 <TextBox x:Name="TextBoxRemoteDesktopGatewayServerHostname" 
-                                         Grid.Column="2" Grid.Row="26"
+                                         Grid.Column="2" Grid.Row="28"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGatewayDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -962,11 +971,11 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="28"
+                                <TextBlock Grid.Column="0" Grid.Row="30"
                                            Text="{x:Static localization:Strings.BypassForLocalAddresses}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="28" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="30" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerBypassLocalAddresses}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -990,10 +999,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="30"
+                                <TextBlock Grid.Column="0" Grid.Row="32"
                                            Text="{x:Static localization:Strings.LogonMethod}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <ComboBox Grid.Column="2" Grid.Row="30"
+                                <ComboBox Grid.Column="2" Grid.Row="32"
                                           ItemsSource="{Binding RemoteDesktop_GatewayServerLogonMethods}"
                                           SelectedItem="{Binding RemoteDesktop_GatewayServerLogonMethod}">
                                     <ComboBox.Style>
@@ -1025,11 +1034,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="32"
+                                <TextBlock Grid.Column="0" Grid.Row="34"
                                            Text="{x:Static localization:Strings.ShareGatewayCredentialsWithRemoteComputer}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="32" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="34" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerShareCredentialsWithRemoteComputer}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -1053,11 +1062,11 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="34"
+                                <TextBlock Grid.Column="0" Grid.Row="36"
                                            Text="{x:Static localization:Strings.UseGatewayCredentials}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="34" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="36" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_UseGatewayServerCredentials}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -1084,10 +1093,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="36"
+                                <TextBlock Grid.Column="0" Grid.Row="38"
                                            Text="{x:Static localization:Strings.Username}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="36"
+                                <TextBox Grid.Column="2" Grid.Row="38"
                                          x:Name="TextBoxRemoteDesktopGatewayServerUsername"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                                     <TextBox.Style>
@@ -1123,10 +1132,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="38" Text="{x:Static localization:Strings.Domain}"
+                                <TextBlock Grid.Column="0" Grid.Row="40" Text="{x:Static localization:Strings.Domain}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="38" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
+                                <TextBox Grid.Column="2" Grid.Row="40" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -1161,10 +1170,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="40"
+                                <TextBlock Grid.Column="0" Grid.Row="42"
                                            Text="{x:Static localization:Strings.Password}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <PasswordBox Grid.Column="2" Grid.Row="40"
+                                <PasswordBox Grid.Column="2" Grid.Row="42"
                                              x:Name="PasswordBoxRemoteDesktopGatewayServerPassword">
                                     <PasswordBox.Style>
                                         <Style TargetType="{x:Type PasswordBox}"
@@ -1203,7 +1212,7 @@
                                             Password="{Binding RemoteDesktop_GatewayServerPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     </interactivity:Interaction.Behaviors>
                                 </PasswordBox>
-                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="40"
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="42"
                                            ToolTip="{x:Static localization:Strings.WarningMessage_ProfileFileNotEncryptedStoringPasswords}"
                                            Visibility="{Binding IsProfileFileEncrypted, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
                                            Style="{StaticResource WarnImageRectangle}" Margin="10,0,0,0">
@@ -1211,11 +1220,11 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="42"
+                                <CheckBox Grid.Column="0" Grid.Row="44"
                                           Content="{x:Static localization:Strings.RemoteAudioPlayback}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="42"
+                                <ComboBox Grid.Column="2" Grid.Row="44"
                                           ItemsSource="{Binding RemoteDesktop_AudioRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioRedirectionMode}">
@@ -1227,11 +1236,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="44"
+                                <CheckBox Grid.Column="0" Grid.Row="46"
                                           Content="{x:Static localization:Strings.RemoteAudioRecording}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="44"
+                                <ComboBox Grid.Column="2" Grid.Row="46"
                                           ItemsSource="{Binding RemoteDesktop_AudioCaptureRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioCaptureRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}">
@@ -1243,11 +1252,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="46"
+                                <CheckBox Grid.Column="0" Grid.Row="48"
                                           Content="{x:Static localization:Strings.ApplyWindowsKeyCombinations}"
                                           IsChecked="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="46"
+                                <ComboBox Grid.Column="2" Grid.Row="48"
                                           ItemsSource="{Binding RemoteDesktop_KeyboardHookModes}"
                                           SelectedItem="{Binding RemoteDesktop_KeyboardHookMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}">
@@ -1259,67 +1268,67 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="48"
+                                <CheckBox Grid.Column="0" Grid.Row="50"
                                           Content="{x:Static localization:Strings.RedirectClipboard}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectClipboard}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="48" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="50" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectClipboard}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectClipboard}" />
-                                <CheckBox Grid.Column="0" Grid.Row="50"
+                                <CheckBox Grid.Column="0" Grid.Row="52"
                                           Content="{x:Static localization:Strings.RedirectDevices}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDevices}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="50" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDevices}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDevices}" />
-                                <CheckBox Grid.Column="0" Grid.Row="52"
+                                <CheckBox Grid.Column="0" Grid.Row="54"
                                           Content="{x:Static localization:Strings.RedirectDrives}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDrives}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDrives}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDrives}" />
-                                <CheckBox Grid.Column="0" Grid.Row="54"
+                                <CheckBox Grid.Column="0" Grid.Row="56"
                                           Content="{x:Static localization:Strings.RedirectPorts}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPorts}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPorts}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPorts}" />
-                                <CheckBox Grid.Column="0" Grid.Row="56"
+                                <CheckBox Grid.Column="0" Grid.Row="58"
                                           Content="{x:Static localization:Strings.RedirectSmartcards}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectSmartcards}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectSmartCards}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectSmartcards}" />
-                                <CheckBox Grid.Column="0" Grid.Row="58"
+                                <CheckBox Grid.Column="0" Grid.Row="60"
                                           Content="{x:Static localization:Strings.RedirectPrinters}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPrinters}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPrinters}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPrinters}" />
-                                <CheckBox Grid.Column="0" Grid.Row="60"
+                                <CheckBox Grid.Column="0" Grid.Row="62"
                                           Content="{x:Static localization:Strings.PersistentBitmapCaching}"
                                           IsChecked="{Binding RemoteDesktop_OverridePersistentBitmapCaching}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_PersistentBitmapCaching}"
                                                   IsEnabled="{Binding RemoteDesktop_OverridePersistentBitmapCaching}" />
-                                <CheckBox Grid.Column="0" Grid.Row="62"
+                                <CheckBox Grid.Column="0" Grid.Row="64"
                                           Content="{x:Static localization:Strings.ReconnectIfTheConnectionIsDropped}"
                                           IsChecked="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="64" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ReconnectIfTheConnectionIsDropped}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}" />
-                                <CheckBox Grid.Column="0" Grid.Row="64"
+                                <CheckBox Grid.Column="0" Grid.Row="66"
                                           Content="{x:Static localization:Strings.NetworkConnectionType}"
                                           IsChecked="{Binding RemoteDesktop_OverrideNetworkConnectionType}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="64"
+                                <ComboBox Grid.Column="2" Grid.Row="66"
                                           ItemsSource="{Binding RemoteDesktop_NetworkConnectionTypes}"
                                           SelectedItem="{Binding RemoteDesktop_NetworkConnectionType}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}">
@@ -1331,42 +1340,42 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="66"
+                                <TextBlock Grid.Column="0" Grid.Row="68"
                                            Text="{x:Static localization:Strings.DesktopBackground}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="66" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="68" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopBackground}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="68"
+                                <TextBlock Grid.Column="0" Grid.Row="70"
                                            Text="{x:Static localization:Strings.FontSmoothing}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="68" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_FontSmoothing}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="70"
+                                <TextBlock Grid.Column="0" Grid.Row="72"
                                            Text="{x:Static localization:Strings.DesktopComposition}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopComposition}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="72"
+                                <TextBlock Grid.Column="0" Grid.Row="74"
                                            Text="{x:Static localization:Strings.ShowWindowContentsWhileDragging}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ShowWindowContentsWhileDragging}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="74"
+                                <TextBlock Grid.Column="0" Grid.Row="76"
                                            Text="{x:Static localization:Strings.MenuAndWindowAnimation}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_MenuAndWindowAnimation}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="76"
+                                <TextBlock Grid.Column="0" Grid.Row="78"
                                            Text="{x:Static localization:Strings.VisualStyles}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="78" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_VisualStyles}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
                             </Grid>
diff --git a/Source/NETworkManager/Views/ProfileChildWindow.xaml b/Source/NETworkManager/Views/ProfileChildWindow.xaml
index 151444aa27..90da9df9f3 100644
--- a/Source/NETworkManager/Views/ProfileChildWindow.xaml
+++ b/Source/NETworkManager/Views/ProfileChildWindow.xaml
@@ -2204,21 +2204,28 @@
                                     </TextBox.Text>
                                 </TextBox>
                                 <CheckBox Grid.Column="0" Grid.Row="24"
+                                          Content="{x:Static localization:Strings.ViewOnly}"
+                                          IsChecked="{Binding RemoteDesktop_OverrideViewOnly}"
+                                          Style="{StaticResource DefaultCheckBox}" />
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="24" OffContent="" OnContent=""
+                                                  IsOn="{Binding RemoteDesktop_ViewOnly}"
+                                                  IsEnabled="{Binding RemoteDesktop_OverrideViewOnly}" />
+                                <CheckBox Grid.Column="0" Grid.Row="26"
                                           Content="{x:Static localization:Strings.CredentialSecuritySupportProvider}"
                                           IsChecked="{Binding RemoteDesktop_OverrideCredSspSupport}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="24" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="26" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableCredSspSupport}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideCredSspSupport}" />
-                                <CheckBox Grid.Column="0" Grid.Row="26"
+                                <CheckBox Grid.Column="0" Grid.Row="28"
                                           Content="{x:Static localization:Strings.AuthenticationLevel}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAuthenticationLevel}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:NumericUpDown Grid.Column="2" Grid.Row="26"
+                                <mah:NumericUpDown Grid.Column="2" Grid.Row="28"
                                                    Value="{Binding RemoteDesktop_AuthenticationLevel}" Maximum="3"
                                                    Minimum="0" Interval="1"
                                                    IsEnabled="{Binding RemoteDesktop_OverrideAuthenticationLevel}" />
-                                <Rectangle Grid.Column="3" Grid.Row="26" 
+                                <Rectangle Grid.Column="3" Grid.Row="28" 
                                            Width="24" Height="24"
                                            ToolTip="{x:Static localization:Strings.HelpMessage_RDPAuthenticationLevel}"
                                            Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
@@ -2226,18 +2233,18 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="28"
+                                <CheckBox Grid.Column="0" Grid.Row="30"
                                           Content="{x:Static localization:Strings.EnableGatewayServer}"
                                           IsChecked="{Binding RemoteDesktop_OverrideGatewayServer}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="28" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="30" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_EnableGatewayServer}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideGatewayServer}" />
-                                <TextBlock Grid.Column="0" Grid.Row="30"
+                                <TextBlock Grid.Column="0" Grid.Row="32"
                                            Text="{x:Static localization:Strings.ServerName}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
                                 <TextBox x:Name="TextBoxRemoteDesktopGatewayServerHostname" 
-                                         Grid.Column="2" Grid.Row="30"
+                                         Grid.Column="2" Grid.Row="32"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleGatewayDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -2270,11 +2277,11 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="32"
+                                <TextBlock Grid.Column="0" Grid.Row="34"
                                            Text="{x:Static localization:Strings.BypassForLocalAddresses}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="32" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="34" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerBypassLocalAddresses}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -2298,10 +2305,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="34"
+                                <TextBlock Grid.Column="0" Grid.Row="36"
                                            Text="{x:Static localization:Strings.LogonMethod}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <ComboBox Grid.Column="2" Grid.Row="34"
+                                <ComboBox Grid.Column="2" Grid.Row="36"
                                           ItemsSource="{Binding RemoteDesktop_GatewayServerLogonMethods}"
                                           SelectedItem="{Binding RemoteDesktop_GatewayServerLogonMethod}">
                                     <ComboBox.Style>
@@ -2333,11 +2340,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="36"
+                                <TextBlock Grid.Column="0" Grid.Row="38"
                                            Text="{x:Static localization:Strings.ShareGatewayCredentialsWithRemoteComputer}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="36" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="38" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_GatewayServerShareCredentialsWithRemoteComputer}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -2361,11 +2368,11 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="38"
+                                <TextBlock Grid.Column="0" Grid.Row="40"
                                            Text="{x:Static localization:Strings.UseGatewayCredentials}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="38" Content="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="40" Content="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_UseGatewayServerCredentials}">
                                     <mah:ToggleSwitch.Style>
                                         <Style TargetType="{x:Type mah:ToggleSwitch}"
@@ -2392,10 +2399,10 @@
                                         </Style>
                                     </mah:ToggleSwitch.Style>
                                 </mah:ToggleSwitch>
-                                <TextBlock Grid.Column="0" Grid.Row="40"
+                                <TextBlock Grid.Column="0" Grid.Row="42"
                                            Text="{x:Static localization:Strings.Username}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="40"
+                                <TextBox Grid.Column="2" Grid.Row="42"
                                          x:Name="TextBoxRemoteDesktopGatewayServerUsername"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleUsername}">
                                     <TextBox.Style>
@@ -2431,10 +2438,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="42" Text="{x:Static localization:Strings.Domain}"
+                                <TextBlock Grid.Column="0" Grid.Row="44" Text="{x:Static localization:Strings.Domain}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <TextBox Grid.Column="2" Grid.Row="42" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
+                                <TextBox Grid.Column="2" Grid.Row="44" x:Name="TextBoxRemoteDesktopGatewayServerDomain"
                                          mah:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExampleDomain}">
                                     <TextBox.Style>
                                         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource DefaultTextBox}">
@@ -2469,10 +2476,10 @@
                                         </Binding>
                                     </TextBox.Text>
                                 </TextBox>
-                                <TextBlock Grid.Column="0" Grid.Row="44"
+                                <TextBlock Grid.Column="0" Grid.Row="46"
                                            Text="{x:Static localization:Strings.Password}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <PasswordBox Grid.Column="2" Grid.Row="44"
+                                <PasswordBox Grid.Column="2" Grid.Row="46"
                                              x:Name="PasswordBoxRemoteDesktopGatewayServerPassword">
                                     <PasswordBox.Style>
                                         <Style TargetType="{x:Type PasswordBox}"
@@ -2511,7 +2518,7 @@
                                             Password="{Binding RemoteDesktop_GatewayServerPassword, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
                                     </interactivity:Interaction.Behaviors>
                                 </PasswordBox>
-                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="44"
+                                <Rectangle Width="24" Height="24" Grid.Column="3" Grid.Row="46"
                                            ToolTip="{x:Static localization:Strings.WarningMessage_ProfileFileNotEncryptedStoringPasswords}"
                                            Visibility="{Binding IsProfileFileEncrypted, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}"
                                            Style="{StaticResource WarnImageRectangle}" Margin="10,0,0,0">
@@ -2519,11 +2526,11 @@
                                         <Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
                                     </Rectangle.Resources>
                                 </Rectangle>
-                                <CheckBox Grid.Column="0" Grid.Row="46"
+                                <CheckBox Grid.Column="0" Grid.Row="48"
                                           Content="{x:Static localization:Strings.RemoteAudioPlayback}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="46"
+                                <ComboBox Grid.Column="2" Grid.Row="48"
                                           ItemsSource="{Binding RemoteDesktop_AudioRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioRedirectionMode}">
@@ -2535,11 +2542,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="48"
+                                <CheckBox Grid.Column="0" Grid.Row="50"
                                           Content="{x:Static localization:Strings.RemoteAudioRecording}"
                                           IsChecked="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="48"
+                                <ComboBox Grid.Column="2" Grid.Row="50"
                                           ItemsSource="{Binding RemoteDesktop_AudioCaptureRedirectionModes}"
                                           SelectedItem="{Binding RemoteDesktop_AudioCaptureRedirectionMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideAudioCaptureRedirectionMode}">
@@ -2551,11 +2558,11 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="50"
+                                <CheckBox Grid.Column="0" Grid.Row="52"
                                           Content="{x:Static localization:Strings.ApplyWindowsKeyCombinations}"
                                           IsChecked="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="50"
+                                <ComboBox Grid.Column="2" Grid.Row="52"
                                           ItemsSource="{Binding RemoteDesktop_KeyboardHookModes}"
                                           SelectedItem="{Binding RemoteDesktop_KeyboardHookMode}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideApplyWindowsKeyCombinations}">
@@ -2567,67 +2574,67 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <CheckBox Grid.Column="0" Grid.Row="52"
+                                <CheckBox Grid.Column="0" Grid.Row="54"
                                           Content="{x:Static localization:Strings.RedirectClipboard}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectClipboard}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="52" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectClipboard}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectClipboard}" />
-                                <CheckBox Grid.Column="0" Grid.Row="54"
+                                <CheckBox Grid.Column="0" Grid.Row="56"
                                           Content="{x:Static localization:Strings.RedirectDevices}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDevices}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="54" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDevices}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDevices}" />
-                                <CheckBox Grid.Column="0" Grid.Row="56"
+                                <CheckBox Grid.Column="0" Grid.Row="58"
                                           Content="{x:Static localization:Strings.RedirectDrives}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectDrives}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="56" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectDrives}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectDrives}" />
-                                <CheckBox Grid.Column="0" Grid.Row="58"
+                                <CheckBox Grid.Column="0" Grid.Row="60"
                                           Content="{x:Static localization:Strings.RedirectPorts}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPorts}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="58" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPorts}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPorts}" />
-                                <CheckBox Grid.Column="0" Grid.Row="60"
+                                <CheckBox Grid.Column="0" Grid.Row="62"
                                           Content="{x:Static localization:Strings.RedirectSmartcards}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectSmartcards}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="60" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectSmartCards}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectSmartcards}" />
-                                <CheckBox Grid.Column="0" Grid.Row="62"
+                                <CheckBox Grid.Column="0" Grid.Row="64"
                                           Content="{x:Static localization:Strings.RedirectPrinters}"
                                           IsChecked="{Binding RemoteDesktop_OverrideRedirectPrinters}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="62" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="64" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_RedirectPrinters}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideRedirectPrinters}" />
-                                <CheckBox Grid.Column="0" Grid.Row="64"
+                                <CheckBox Grid.Column="0" Grid.Row="66"
                                           Content="{x:Static localization:Strings.PersistentBitmapCaching}"
                                           IsChecked="{Binding RemoteDesktop_OverridePersistentBitmapCaching}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="64" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="66" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_PersistentBitmapCaching}"
                                                   IsEnabled="{Binding RemoteDesktop_OverridePersistentBitmapCaching}" />
-                                <CheckBox Grid.Column="0" Grid.Row="66"
+                                <CheckBox Grid.Column="0" Grid.Row="68"
                                           Content="{x:Static localization:Strings.ReconnectIfTheConnectionIsDropped}"
                                           IsChecked="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="66" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="68" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ReconnectIfTheConnectionIsDropped}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideReconnectIfTheConnectionIsDropped}" />
-                                <CheckBox Grid.Column="0" Grid.Row="68"
+                                <CheckBox Grid.Column="0" Grid.Row="70"
                                           Content="{x:Static localization:Strings.NetworkConnectionType}"
                                           IsChecked="{Binding RemoteDesktop_OverrideNetworkConnectionType}"
                                           Style="{StaticResource DefaultCheckBox}" />
-                                <ComboBox Grid.Column="2" Grid.Row="68"
+                                <ComboBox Grid.Column="2" Grid.Row="70"
                                           ItemsSource="{Binding RemoteDesktop_NetworkConnectionTypes}"
                                           SelectedItem="{Binding RemoteDesktop_NetworkConnectionType}"
                                           IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}">
@@ -2639,42 +2646,42 @@
                                         </DataTemplate>
                                     </ComboBox.ItemTemplate>
                                 </ComboBox>
-                                <TextBlock Grid.Column="0" Grid.Row="70"
+                                <TextBlock Grid.Column="0" Grid.Row="72"
                                            Text="{x:Static localization:Strings.DesktopBackground}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="70" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopBackground}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="72"
+                                <TextBlock Grid.Column="0" Grid.Row="74"
                                            Text="{x:Static localization:Strings.FontSmoothing}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="72" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_FontSmoothing}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="74"
+                                <TextBlock Grid.Column="0" Grid.Row="76"
                                            Text="{x:Static localization:Strings.DesktopComposition}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="74" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_DesktopComposition}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="76"
+                                <TextBlock Grid.Column="0" Grid.Row="78"
                                            Text="{x:Static localization:Strings.ShowWindowContentsWhileDragging}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="76" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="78" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_ShowWindowContentsWhileDragging}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="78"
+                                <TextBlock Grid.Column="0" Grid.Row="80"
                                            Text="{x:Static localization:Strings.MenuAndWindowAnimation}"
                                            Margin="24,0,0,0" VerticalAlignment="Center"
                                            Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="78" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="80" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_MenuAndWindowAnimation}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
-                                <TextBlock Grid.Column="0" Grid.Row="80"
+                                <TextBlock Grid.Column="0" Grid.Row="82"
                                            Text="{x:Static localization:Strings.VisualStyles}" Margin="24,0,0,0"
                                            VerticalAlignment="Center" Style="{StaticResource DisabledTextBlock}" />
-                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="80" OffContent="" OnContent=""
+                                <mah:ToggleSwitch Grid.Column="2" Grid.Row="82" OffContent="" OnContent=""
                                                   IsOn="{Binding RemoteDesktop_VisualStyles}"
                                                   IsEnabled="{Binding RemoteDesktop_OverrideNetworkConnectionType}" />
                             </Grid>
diff --git a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
index 870cff2534..d04bc63685 100644
--- a/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopConnectChildWindow.xaml
@@ -144,9 +144,13 @@
             </Grid.ColumnDefinitions>
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="10" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.AdminConsoleSession}" />
             <mah:ToggleSwitch Grid.Column="2" Grid.Row="0" OffContent="" OnContent="" IsOn="{Binding AdminSession}" />
+            <TextBlock Grid.Column="0" Grid.Row="2" Text="{x:Static localization:Strings.ViewOnly}" />
+            <mah:ToggleSwitch Grid.Column="2" Grid.Row="2" OffContent="" OnContent="" IsOn="{Binding ViewOnly}" />
         </Grid>
         <StackPanel Grid.Row="5" Orientation="Horizontal" HorizontalAlignment="Right">
             <Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}"
diff --git a/Source/NETworkManager/Views/RemoteDesktopHostView.xaml b/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
index 83d9df9004..1eac70dca0 100644
--- a/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopHostView.xaml
@@ -47,7 +47,8 @@
                                 <ContextMenu>
                                     <MenuItem Header="{x:Static localization:Strings.Reconnect}"
                                               Command="{Binding Data.ReconnectCommand, Source={StaticResource BindingProxy}}"
-                                              CommandParameter="{Binding View}">
+                                              CommandParameter="{Binding View}"
+                                              Visibility="{Binding View.IsConnected, Converter={StaticResource BooleanReverseToVisibilityCollapsedConverter}}">
                                         <MenuItem.Icon>
                                             <Rectangle Width="16" Height="16"
                                                        Fill="{DynamicResource MahApps.Brushes.Gray3}">
@@ -60,7 +61,8 @@
                                     </MenuItem>
                                     <MenuItem Header="{x:Static localization:Strings.Disconnect}"
                                               Command="{Binding Data.DisconnectCommand, Source={StaticResource BindingProxy}}"
-                                              CommandParameter="{Binding View}">
+                                              CommandParameter="{Binding View}"
+                                              Visibility="{Binding View.IsConnected, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                         <MenuItem.Icon>
                                             <Rectangle Width="16" Height="16"
                                                        Fill="{DynamicResource MahApps.Brushes.Gray3}">
@@ -98,6 +100,34 @@
                                             </Rectangle>
                                         </MenuItem.Icon>
                                     </MenuItem>
+                                    <MenuItem Header="{x:Static localization:Strings.ViewOnly}"
+                                              Command="{Binding Data.ViewOnlyCommand, Source={StaticResource BindingProxy}}"
+                                              CommandParameter="{Binding View}">
+                                        <MenuItem.Icon>
+                                            <Rectangle Width="16" Height="16"
+                                                       Fill="{DynamicResource MahApps.Brushes.Gray3}">
+                                                <Rectangle.Resources>
+                                                    <VisualBrush x:Key="VisualEye" Stretch="Uniform"
+                                                                 Visual="{iconPacks:Material Kind=Eye}" />
+                                                    <VisualBrush x:Key="VisualEyeOff" Stretch="Uniform"
+                                                                 Visual="{iconPacks:Material Kind=EyeOff}" />
+                                                </Rectangle.Resources>
+                                                <Rectangle.Style>
+                                                    <Style TargetType="{x:Type Rectangle}">
+                                                        <Setter Property="OpacityMask"
+                                                                Value="{StaticResource VisualEyeOff}" />
+                                                        <Style.Triggers>
+                                                            <DataTrigger Binding="{Binding View.IsViewOnly}"
+                                                                         Value="True">
+                                                                <Setter Property="OpacityMask"
+                                                                        Value="{StaticResource VisualEye}" />
+                                                            </DataTrigger>
+                                                        </Style.Triggers>
+                                                    </Style>
+                                                </Rectangle.Style>
+                                            </Rectangle>
+                                        </MenuItem.Icon>
+                                    </MenuItem>
                                     <Separator />
                                     <MenuItem Header="{x:Static localization:Strings.KeyboardShortcuts}">
                                         <MenuItem.Icon>
@@ -148,6 +178,15 @@
                                     <Thumb Style="{DynamicResource InvisibleThumbStyle}"
                                            dragablz:DragablzItem.IsCustomThumb="True" />
                                 </Grid>
+                                <Rectangle Width="16" Height="16" Margin="0,0,10,0"
+                                           VerticalAlignment="Center"
+                                           Fill="{DynamicResource MahApps.Brushes.Gray3}"
+                                           ToolTip="{x:Static localization:Strings.ViewOnly}"
+                                           Visibility="{Binding View.IsViewOnly, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
+                                    <Rectangle.OpacityMask>
+                                        <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Eye}" />
+                                    </Rectangle.OpacityMask>
+                                </Rectangle>
                                 <Button Style="{StaticResource CleanButton}"
                                         Command="dragablz:TabablzControl.CloseItemCommand"
                                         ToolTip="{x:Static localization:Strings.Close}" Margin="0,0,10,0">
diff --git a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml
index 3b373cb0a1..a5fd7a44b8 100644
--- a/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml
+++ b/Source/NETworkManager/Views/RemoteDesktopSettingsView.xaml
@@ -101,6 +101,9 @@
                 </Binding>
             </TextBox.Text>
         </TextBox>
+        <TextBlock Text="{x:Static localization:Strings.ViewOnly}" Style="{StaticResource HeaderTextBlock}" />
+        <mah:ToggleSwitch Header="{x:Static localization:Strings.ViewOnlyDescription}" IsOn="{Binding ViewOnly}"
+                          Margin="0,0,0,20" />
         <TextBlock Text="{x:Static localization:Strings.Authentication}" Style="{StaticResource HeaderTextBlock}" />
         <mah:ToggleSwitch Header="{x:Static localization:Strings.EnableCredentialSecuritySupportProvider}"
                           IsOn="{Binding EnableCredSspSupport}" Margin="0,0,0,10" />
diff --git a/Website/docs/application/remote-desktop.md b/Website/docs/application/remote-desktop.md
index c715d5cb22..ff83017118 100644
--- a/Website/docs/application/remote-desktop.md
+++ b/Website/docs/application/remote-desktop.md
@@ -33,9 +33,10 @@ Right-clicking a session tab opens a context menu:
 | ------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | **Reconnect**                         | Reconnects to the remote computer (only if disconnected)                                                                                                                                          |
 | **Disconnect**                        | Disconnects from the remote computer (only if connected)                                                                                                                                          |
-| **Fullscreen**                        | Toggles fullscreen mode (only if connected)                                                                                                                                                       |
+| **Fullscreen**                        | Toggles fullscreen mode (only if connected and not in view only mode)                                                                                                                                                       |
 | **Adjust screen**                     | Adjusts the screen size to the current view size; only available if [Display](#display) is set to `Adjust screen automatically` or `Use the current view size as screen size` (only if connected) |
-| **Keyboard shortcuts > Ctrl+Alt+Del** | Sends Ctrl+Alt+Del to the remote computer (only if connected)                                                                                                                                     |
+| **View only**                         | Toggles [view only](#view-only) mode, which blocks keyboard and mouse input to the remote session while the screen keeps updating (only if connected)                                             |
+| **Keyboard shortcuts > Ctrl+Alt+Del** | Sends Ctrl+Alt+Del to the remote computer (only if connected and not in view only mode)                                                                                                           |
 
 ## Connect
 
@@ -124,6 +125,14 @@ Connect to the admin (console) session of the remote computer.
 
 **Default:** `Disabled`
 
+### View only
+
+Connect in view only mode. Keyboard and mouse input to the remote session is blocked while the screen keeps updating, so the session can be monitored without interacting with it. View only mode can also be toggled on the fly via the [tab context menu](#tab-context-menu). While it is active, an eye icon is shown on the tab and the **Fullscreen** and **Ctrl+Alt+Del** actions are disabled to prevent bypassing it.
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ## Profile
 
 ### Inherit host from general
@@ -274,6 +283,14 @@ Port used for the remote desktop connection.
 
 **Default:** `3389`
 
+### View only
+
+Block keyboard and mouse input to the remote session. When enabled, the session can be monitored without interacting with it while the screen keeps updating. The value is inherited in the order Global → Group → Profile. View only mode can also be toggled on the fly via the [tab context menu](#tab-context-menu).
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ### Credential Security Support Provider
 
 Use the Credential Security Support Provider (CredSSP) protocol to authenticate with the remote computer.
@@ -682,6 +699,14 @@ Port used for the remote desktop connection.
 
 **Default:** `3389`
 
+### View only
+
+Block keyboard and mouse input to the remote session. When enabled, the session can be monitored without interacting with it while the screen keeps updating. The value is inherited in the order Global → Group → Profile. View only mode can also be toggled on the fly via the [tab context menu](#tab-context-menu).
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ### Credential Security Support Provider
 
 Use the Credential Security Support Provider (CredSSP) protocol to authenticate with the remote computer.
@@ -1020,6 +1045,14 @@ Port used for the remote desktop connection.
 
 **Default:** `3389`
 
+### View only
+
+Block keyboard and mouse input to the remote session. When enabled, the session can be monitored without interacting with it while the screen keeps updating. The value is inherited in the order Global → Group → Profile. View only mode can also be toggled on the fly via the [tab context menu](#tab-context-menu).
+
+**Type:** `Boolean`
+
+**Default:** `Disabled`
+
 ### Credential Security Support Provider
 
 Use the Credential Security Support Provider (CredSSP) protocol to authenticate with the remote computer.
@@ -1235,4 +1268,4 @@ Configure the network connection type for the remote desktop connection.
 - `Satellite (2 Mbps - 16 Mbps with high latency)`
 - `High-speed broadband (2 Mbps - 10 Mbps)`
 - `WAN (10 Mbps or higher with high latency)`
-- `LAN (10 Mbps or higher)`
+- `LAN (10 Mbps or higher)`
\ No newline at end of file
diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index bfc7ba6941..b78d183d82 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -68,6 +68,10 @@ Release date: **xx.xx.2025**
 
 - New **status change notifications**: when a monitored host goes up or down, a stackable popup appears in the bottom-right corner of the primary screen and/or an optional system sound is played. Configurable **success** and **failure thresholds** suppress noise from flapping hosts, the initial state is established silently, and clicking a popup brings the main window to the front. When many hosts change state at once, every host still shows its own popup but the sound is played only once. (See the [documentation](https://borntoberoot.net/NETworkManager/docs/application/ping-monitor#notifications) for more details) [#3471](https://github.com/BornToBeRoot/NETworkManager/pull/3471)
 
+**Remote Desktop**
+
+- New **View only** mode to monitor a session without sending input: keyboard and mouse are blocked while the screen keeps updating. It can be enabled in the connect dialog, per profile/group, and globally (inherited Global → Group → Profile), or toggled on the fly via the tab's right-click menu. An eye icon on the tab indicates when a session is view-only, and the **Fullscreen** and **Ctrl+Alt+Del** actions are disabled while it is active to prevent bypassing it. [#XXXX](https://github.com/BornToBeRoot/NETworkManager/pull/XXXX)
+
 ## Improvements
 
 **WiFi**

From e13af6ceef6b7d4fd14fd0ebae7658cbb8794ddc Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Sun, 14 Jun 2026 23:56:48 +0200
Subject: [PATCH 2/3] Docs: #3482

---
 Website/docs/changelog/next-release.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Website/docs/changelog/next-release.md b/Website/docs/changelog/next-release.md
index b78d183d82..934ec5c819 100644
--- a/Website/docs/changelog/next-release.md
+++ b/Website/docs/changelog/next-release.md
@@ -70,7 +70,7 @@ Release date: **xx.xx.2025**
 
 **Remote Desktop**
 
-- New **View only** mode to monitor a session without sending input: keyboard and mouse are blocked while the screen keeps updating. It can be enabled in the connect dialog, per profile/group, and globally (inherited Global → Group → Profile), or toggled on the fly via the tab's right-click menu. An eye icon on the tab indicates when a session is view-only, and the **Fullscreen** and **Ctrl+Alt+Del** actions are disabled while it is active to prevent bypassing it. [#XXXX](https://github.com/BornToBeRoot/NETworkManager/pull/XXXX)
+- New **View only** mode to monitor a session without sending input: keyboard and mouse are blocked while the screen keeps updating. It can be enabled in the connect dialog, per profile/group, and globally (inherited Global → Group → Profile), or toggled on the fly via the tab's right-click menu. An eye icon on the tab indicates when a session is view-only, and the **Fullscreen** and **Ctrl+Alt+Del** actions are disabled while it is active to prevent bypassing it. [#3482](https://github.com/BornToBeRoot/NETworkManager/pull/3482)
 
 ## Improvements
 

From 981d0edf720a7b6d83ae2733f5b650ba329a7b3c Mon Sep 17 00:00:00 2001
From: BornToBeRoot <16019165+BornToBeRoot@users.noreply.github.com>
Date: Mon, 15 Jun 2026 00:08:23 +0200
Subject: [PATCH 3/3] Update RemoteDesktopControl.xaml.cs

---
 Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
index 16118c7129..d4542884ea 100644
--- a/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
+++ b/Source/NETworkManager/Controls/RemoteDesktopControl.xaml.cs
@@ -551,8 +551,11 @@ private void ApplyViewOnly()
         }
         else
         {
-            // Hand input back to the session.
+            // Hand input back to the session and restore the control's default focus
+            // behavior (UserControl is not focusable by default), so toggling view-only
+            // off leaves no lingering focus side effects.
             RdpClient.Focus();
+            Focusable = false;
         }
     }