diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp
index a756b01f..ccf45577 100644
--- a/SandboxiePlus/SandMan/SandMan.cpp
+++ b/SandboxiePlus/SandMan/SandMan.cpp
@@ -405,13 +405,6 @@ void CSandMan::CreateMenus(bool bAdvanced)
 
 		CreateViewBaseMenu();
 
-		m_pMenuView->addSeparator();
-		m_pMenuBrowse = m_pMenuView->addAction(CSandMan::GetIcon("Tree"), tr("Show File Panel"), this, SLOT(OnProcView()));
-		m_pMenuBrowse->setCheckable(true);
-		m_pMenuBrowse->setShortcut(QKeySequence("Ctrl+D"));
-		m_pMenuBrowse->setShortcutContext(Qt::WidgetWithChildrenShortcut);
-		this->addAction(m_pMenuBrowse);
-
 	if(bAdvanced) {
 		m_pMenuView->addSeparator();
 
@@ -425,6 +418,13 @@ void CSandMan::CreateMenus(bool bAdvanced)
 		m_pShowAllSessions = NULL;
 	}
 
+		m_pMenuView->addSeparator();
+		m_pMenuBrowse = m_pMenuView->addAction(/*CSandMan::GetIcon("Tree"),*/ tr("Show File Panel"), this, SLOT(OnProcView()));
+		m_pMenuBrowse->setCheckable(true);
+		m_pMenuBrowse->setShortcut(QKeySequence("Ctrl+D"));
+		m_pMenuBrowse->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+		this->addAction(m_pMenuBrowse);
+
 		m_pMenuView->addSeparator();
 
 		m_pRefreshAll = m_pMenuView->addAction(CSandMan::GetIcon("Refresh"), tr("Refresh View"), this, SLOT(OnRefresh()));
@@ -1682,15 +1682,6 @@ void CSandMan::OnSandBoxAction()
 		GetBoxView()->AddNewBox();
 	else if(pAction == m_pNewGroup)
 		GetBoxView()->AddNewGroup();
-
-	// for old menu
-	else
-	{
-		CSettingsWindow* pSettingsWindow = new CSettingsWindow(this);
-		connect(pSettingsWindow, SIGNAL(OptionsChanged(bool)), this, SLOT(UpdateSettings(bool)));
-		int Tab = pAction->data().toInt();
-		pSettingsWindow->showTab(Tab);
-	}
 }
 
 void CSandMan::OnEmptyAll()
@@ -1964,6 +1955,16 @@ void CSandMan::OnProcView()
 	if (m_pMenuBrowse) {
 		theConf->SetValue("Options/ShowFilePanel", m_pMenuBrowse->isChecked());
 		m_pFileView->setVisible(m_pMenuBrowse->isChecked());
+
+		if (m_pMenuBrowse->isChecked()) {
+			QTimer::singleShot(10, [&] {
+				auto Sizes = m_pPanelSplitter->sizes();
+				if (Sizes.at(1) == 0) {
+					Sizes[1] = 100;
+					m_pPanelSplitter->setSizes(Sizes);
+				}
+			});
+		}
 	}
 }
 
diff --git a/SandboxiePlus/SandMan/SbieFindWnd.cpp b/SandboxiePlus/SandMan/SbieFindWnd.cpp
index a8ff7f37..520ebf5d 100644
--- a/SandboxiePlus/SandMan/SbieFindWnd.cpp
+++ b/SandboxiePlus/SandMan/SbieFindWnd.cpp
@@ -213,6 +213,7 @@ DWORD WINAPI FinderThreadFunc(LPVOID lpParam)
 	return (int)msg.wParam;
 }
 
+
 void CSandMan::OnWndFinder()
 {
 	m_pWndFinder->setEnabled(false);
diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp
index 49021a5e..602d3950 100644
--- a/SandboxiePlus/SandMan/Views/SbieView.cpp
+++ b/SandboxiePlus/SandMan/Views/SbieView.cpp
@@ -286,7 +286,7 @@ void CSbieView::CreateOldMenu()
 		m_pMenuSnapshots = m_pMenuTools->addAction(CSandMan::GetIcon("Snapshots"), tr("Snapshots Manager"), this, SLOT(OnSandBoxAction()));
 
 		m_pMenuTools->addSeparator();
-		m_pMenuDuplicate = m_pMenuTools->addAction(CSandMan::GetIcon("Duplicate"), tr("Duplicate Box Config"), this, SLOT(OnSandBoxAction()));
+		m_pMenuDuplicate = m_pMenuTools->addAction(CSandMan::GetIcon("Duplicate"), tr("Duplicate Sandbox Config"), this, SLOT(OnSandBoxAction()));
 
 		m_pMenuTools->addSeparator();
 		m_pMenuRefresh = m_pMenuTools->addAction(CSandMan::GetIcon("Refresh"), tr("Refresh Info"), this, SLOT(OnSandBoxAction()));
diff --git a/SandboxiePlus/SandMan/Views/TraceView.h b/SandboxiePlus/SandMan/Views/TraceView.h
index d6c74182..8396a3d6 100644
--- a/SandboxiePlus/SandMan/Views/TraceView.h
+++ b/SandboxiePlus/SandMan/Views/TraceView.h
@@ -114,6 +114,10 @@ protected:
 	QStackedLayout*		m_pLayout;
 };
 
+
+////////////////////////////////////////////////////////////////////////////////////////
+// CTraceWindow
+
 class CTraceWindow : public QDialog
 {
 	Q_OBJECT