diff --git a/mRemoteV1/CHANGELOG.TXT b/mRemoteV1/CHANGELOG.TXT
index a59aa40cc..c9ec1250c 100644
--- a/mRemoteV1/CHANGELOG.TXT
+++ b/mRemoteV1/CHANGELOG.TXT
@@ -1,4 +1,5 @@
 1.64:
+  AR: Bugs fixed: #14, #22, #25
   AR: Fixed translations, moved everything into resx, refactoring, namespace renamed to mRemoteNG
   AR: Removed confConsNew.xml -> creating new files with vb code
   AR: Fixed RD Gateway and other inheritance bugs, rewritten to use a List of String instead of a string for hiding properties
diff --git a/mRemoteV1/UI/UI.Window.Config.vb b/mRemoteV1/UI/UI.Window.Config.vb
index 1e6471e35..560998f55 100644
--- a/mRemoteV1/UI/UI.Window.Config.vb
+++ b/mRemoteV1/UI/UI.Window.Config.vb
@@ -235,6 +235,8 @@ Namespace UI
 
                     If pGrid.SelectedGridItem.Parent.GridItems.Count > gridItemIndex + 1 Then
                         pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex + 1).Select()
+                    Else
+                        pGrid.SelectedGridItem.Parent.GridItems(0).Select()
                     End If
                 End If
                 If keyData = (Keys.Tab Or Keys.Shift) Then
@@ -249,6 +251,8 @@ Namespace UI
 
                     If gridItemIndex - 1 >= 0 Then
                         pGrid.SelectedGridItem.Parent.GridItems(gridItemIndex - 1).Select()
+                    Else
+                        pGrid.SelectedGridItem.Parent.GridItems(pGrid.SelectedGridItem.Parent.GridItems.Count - 1).Select()
                     End If
                 End If