diff --git a/mRemoteNG/UI/Tabs/TabHelper.cs b/mRemoteNG/UI/Tabs/TabHelper.cs
index 62e102d8..5caef75f 100644
--- a/mRemoteNG/UI/Tabs/TabHelper.cs
+++ b/mRemoteNG/UI/Tabs/TabHelper.cs
@@ -48,8 +48,9 @@ namespace mRemoteNG.UI.Tabs
             set
             {
                 currentPanel = value;
-                Runtime.MessageCollector.AddMessage(Messages.MessageClass.DebugMsg,
-                                                    "Panel got focused: " + currentPanel.TabText);
+                //Disabled due to interaction with popups that would show this information and cause a softlock
+                //Runtime.MessageCollector.AddMessage(Messages.MessageClass.DebugMsg,
+                //                                    "Panel got focused: " + currentPanel.TabText);
             }
         }
     }
diff --git a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
index 3a5e4436..93fc29ec 100644
--- a/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
+++ b/mRemoteNG/UI/Window/ConnectionTreeWindow.cs
@@ -141,7 +141,7 @@ namespace mRemoteNG.UI.Window
                 new RootNodeExpander()
             };
 
-            if (Settings.Default.OpenConsFromLastSession && !Settings.Default.NoReconnect)
+            if (Settings.Default.OpenConsFromLastSession && !Settings.Default.NoReconnect && !Settings.Default.AlwaysShowPanelSelectionDlg)
                 actions.Add(new PreviousSessionOpener(Runtime.ConnectionInitiator));
 
             ConnectionTree.PostSetupActions = actions;