diff --git a/mRemoteV1/App/App.Runtime.vb b/mRemoteV1/App/App.Runtime.vb
index ddb3a8113..3d3b63cb3 100644
--- a/mRemoteV1/App/App.Runtime.vb
+++ b/mRemoteV1/App/App.Runtime.vb
@@ -206,24 +206,21 @@ Namespace App
             Public Shared Sub SetDefaultLayout()
                 frmMain.pnlDock.Visible = False
 
-                Windows.configPanel.Show(frmMain.pnlDock, DockState.DockLeft)
+                frmMain.pnlDock.DockLeftPortion = 0.25
+                frmMain.pnlDock.DockRightPortion = 0.25
+                frmMain.pnlDock.DockTopPortion = 0.25
+                frmMain.pnlDock.DockBottomPortion = 0.25
 
                 Windows.treePanel.Show(frmMain.pnlDock, DockState.DockLeft)
-                For Each pane As DockPane In frmMain.pnlDock.Panes
-                    If pane.DockState = DockState.DockLeft Then
-                        Windows.treePanel.DockTo(pane, DockStyle.Top, 0)
-                        Exit For
-                    End If
-                Next
-
-                Windows.errorsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-
-                Windows.sessionsPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-
-                Windows.screenshotPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
-                Windows.screenshotForm.Hide()
+                Windows.configPanel.Show(frmMain.pnlDock)
+                Windows.configPanel.DockTo(Windows.treePanel.Pane, DockStyle.Bottom, -1)
 
                 Windows.quickyPanel.Show(frmMain.pnlDock, DockState.DockBottomAutoHide)
+                Windows.screenshotPanel.Show(Windows.quickyPanel.Pane, Windows.quickyPanel)
+                Windows.sessionsPanel.Show(Windows.quickyPanel.Pane, Windows.screenshotPanel)
+                Windows.errorsPanel.Show(Windows.quickyPanel.Pane, Windows.sessionsPanel)
+
+                Windows.screenshotForm.Hide()
                 Windows.quickyForm.Hide()
 
                 frmMain.pnlDock.Visible = True
diff --git a/mRemoteV1/CHANGELOG.TXT b/mRemoteV1/CHANGELOG.TXT
index 28e9ed018..803ea4a14 100644
--- a/mRemoteV1/CHANGELOG.TXT
+++ b/mRemoteV1/CHANGELOG.TXT
@@ -23,6 +23,7 @@
   Improved loading and saving of window location.
   Removed flickering on start up.
   Changed the Options page into a normal dialog.
+  Improved Reset Layout function.
   Changed to use full four part version numbers with major, minor, build, and revision.
 
 1.66 (2011-05-02):