diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index c57cd0d3..84ee058b 100644
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -1301,7 +1301,7 @@ Namespace App
                     End If
                 End If
 
-
+                ' Create connection based on protocol type
                 Select Case nCi.Protocol
                     Case Connection.Protocol.Protocols.RDP
                         nProt = New Connection.Protocol.RDP
@@ -1377,7 +1377,6 @@ Namespace App
                 AddHandler nProt.Closed, AddressOf Prot_Event_Closed
                 AddHandler nProt.ErrorOccured, AddressOf Prot_Event_ErrorOccured
 
-
                 nProt.InterfaceControl = New Connection.InterfaceControl(cContainer, nProt, nCi)
 
                 nProt.Force = Force
diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb
index d851c1d1..1e6471e3 100644
--- a/mRemoteV1/UI/UI.Window.Config.vb
+++ b/mRemoteV1/UI/UI.Window.Config.vb
@@ -213,44 +213,47 @@ Namespace UI
                 Me.InitializeComponent()
             End Sub
 
-            'Protected Overrides Function ProcessCmdKey(ByRef msg As System.Windows.Forms.Message, ByVal keyData As System.Windows.Forms.Keys) As Boolean
-            '    Debug.Print("key: " & keyData.ToString)
-            '    Debug.Print("msg: " & msg.Msg)
-            '    Debug.Print("hwnd: " & msg.HWnd.ToString)
-            '    Debug.Print("lparam: " & msg.LParam.ToString)
-            '    Debug.Print("wparam: " & msg.WParam.ToString)
-            '    Debug.Print("result: " & msg.Result.ToString)
+            ' Main form handle command key events
+            Protected Overrides Function ProcessCmdKey(ByRef msg As System.Windows.Forms.Message, ByVal keyData As System.Windows.Forms.Keys) As Boolean
+#If DEBUG Then
+                Debug.Print("key: " & keyData.ToString)
+                Debug.Print("msg: " & msg.Msg)
+                Debug.Print("hwnd: " & msg.HWnd.ToString)
+                Debug.Print("lparam: " & msg.LParam.ToString)
+                Debug.Print("wparam: " & msg.WParam.ToString)
+                Debug.Print("result: " & msg.Result.ToString)
+#End If
+                If keyData = Keys.Tab Then
+                    Dim curGridItemLabel As String = pGrid.SelectedGridItem.Label
+                    Dim gridItemIndex As Integer
 
-            '    If keyData = Keys.Tab Then
-            '        Dim curGridItemLabel As String = pGrid.SelectedGridItem.Label
-            '        Dim gridItemIndex As Integer
+                    For gridItemIndex = 0 To pGrid.SelectedGridItem.Parent.GridItems.Count
+                        If pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex).Label = curGridItemLabel Then
+                            Exit For
+                        End If
+                    Next
 
-            '        For gridItemIndex = 0 To pGrid.SelectedGridItem.Parent.GridItems.Count
-            '            If pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex).Label = curGridItemLabel Then
-            '                Exit For
-            '            End If
-            '        Next
+                    If pGrid.SelectedGridItem.Parent.GridItems.Count > gridItemIndex + 1 Then
+                        pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex + 1).Select()
+                    End If
+                End If
+                If keyData = (Keys.Tab Or Keys.Shift) Then
+                    Dim curGridItemLabel As String = pGrid.SelectedGridItem.Label
+                    Dim gridItemIndex As Integer
 
-            '        If pGrid.SelectedGridItem.Parent.GridItems.Count > gridItemIndex + 1 Then
-            '            pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex + 1).Select()
-            '        End If
-            '    ElseIf keyData = (Keys.Tab Or Keys.Shift) Then
-            '        Dim curGridItemLabel As String = pGrid.SelectedGridItem.Label
-            '        Dim gridItemIndex As Integer
+                    For gridItemIndex = 0 To pGrid.SelectedGridItem.Parent.GridItems.Count
+                        If pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex).Label = curGridItemLabel Then
+                            Exit For
+                        End If
+                    Next
 
-            '        For gridItemIndex = 0 To pGrid.SelectedGridItem.Parent.GridItems.Count
-            '            If pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex).Label = curGridItemLabel Then
-            '                Exit For
-            '            End If
-            '        Next
+                    If gridItemIndex - 1 >= 0 Then
+                        pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex - 1).Select()
+                    End If
+                End If
 
-            '        If gridItemIndex - 1 >= 0 Then
-            '            pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex - 1).Select()
-            '        End If
-            '    End If
-
-            '    Return MyBase.ProcessCmdKey(msg, keyData)
-            'End Function
+                Return MyBase.ProcessCmdKey(msg, keyData)
+            End Function
 
             Public Sub SetPropertyGridObject(ByVal Obj As Object)
                 Try