diff --git a/mRemoteV1/Connection/AbstractConnectionInfoData.cs b/mRemoteV1/Connection/AbstractConnectionInfoData.cs
index c6ee05043..86e4fd7f2 100644
--- a/mRemoteV1/Connection/AbstractConnectionInfoData.cs
+++ b/mRemoteV1/Connection/AbstractConnectionInfoData.cs
@@ -233,7 +233,14 @@ namespace mRemoteNG.Connection
         public virtual int RDPMinutesToIdleTimeout
         {
             get { return GetPropertyValue("RDPMinutesToIdleTimeout", _rdpMinutesToIdleTimeout); }
-            set { SetField(ref _rdpMinutesToIdleTimeout, value, "RDPMinutesToIdleTimeout"); }
+            set {
+                if(value < 0) {
+                    value = 0;
+                } else if(value > 240) {
+                    value = 240;
+                }
+                SetField(ref _rdpMinutesToIdleTimeout, value, "RDPMinutesToIdleTimeout");
+            }
         }
         [LocalizedAttributes.LocalizedCategory("strCategoryProtocol", 3),
             LocalizedAttributes.LocalizedDisplayName("strPropertyNameRDPAlertIdleTimeout"),
diff --git a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
index 435a2b16b..a7d85433f 100644
--- a/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
+++ b/mRemoteV1/Connection/Protocol/RDP/Connection.Protocol.RDP.cs
@@ -132,20 +132,7 @@ namespace mRemoteNG.Connection.Protocol.RDP
                 _rdpClient.FullScreenTitle = _connectionInfo.Name;
 
                 _alertOnIdleDisconnect = _connectionInfo.RDPAlertIdleTimeout;
-                
-                // Set the timeout to the default (zero) if it is out of bounds.
-                if (_connectionInfo.RDPMinutesToIdleTimeout < 0)
-                {
-                    _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = Settings.Default.ConDefaultRDPMinutesToIdleTimeout;
-                } // Set the timeout to the max (240) if it is out of bounds.
-                else if (_connectionInfo.RDPMinutesToIdleTimeout > 240)
-                {
-                    _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = 240;
-                }
-                else
-                {
-                    _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = _connectionInfo.RDPMinutesToIdleTimeout;
-                }
+                _rdpClient.AdvancedSettings2.MinutesToIdleTimeout = _connectionInfo.RDPMinutesToIdleTimeout;
 
                 //not user changeable
                 _rdpClient.AdvancedSettings2.GrabFocusOnConnect = true;