diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44367b94..01297bc4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - fixed Firewall Rules - Colors make testing difficult in dark mode [#2900](https://github.com/sandboxie-plus/Sandboxie/issues/2900)
 - fixed RecoverFolder shows GUID instead of folder name [#2918](https://github.com/sandboxie-plus/Sandboxie/issues/2918)
 - fixed System tray icon hourglass overlay gets stuck when operation is stopped [#2869](https://github.com/sandboxie-plus/Sandboxie/issues/2869)
-
+- fixed  File Panel doesn't allow to adjust columns size in a permanent way [#2930](https://github.com/sandboxie-plus/Sandboxie/issues/2930)
 
 
 
diff --git a/SandboxiePlus/SandMan/Views/FileView.cpp b/SandboxiePlus/SandMan/Views/FileView.cpp
index f44821d3..7f4bcf02 100644
--- a/SandboxiePlus/SandMan/Views/FileView.cpp
+++ b/SandboxiePlus/SandMan/Views/FileView.cpp
@@ -31,10 +31,6 @@ CFileView::CFileView(QWidget *parent)
 	m_pTreeView->setContextMenuPolicy(Qt::CustomContextMenu);
 	connect(m_pTreeView, SIGNAL(customContextMenuRequested( const QPoint& )), this, SLOT(OnFileMenu(const QPoint &)));
 	connect(m_pTreeView, SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(OnFileDblClick(const QModelIndex &)));
-
-    QByteArray Columns = theConf->GetBlob("MainWindow/FileTree_Columns");
-	if (!Columns.isEmpty())
-		m_pTreeView->header()->restoreState(Columns);
 }
 
 CFileView::~CFileView()
@@ -44,7 +40,8 @@ CFileView::~CFileView()
 
 void CFileView::SaveState()
 {
-    theConf->SetBlob("MainWindow/FileTree_Columns", m_pTreeView->header()->saveState());
+    if(m_pFileModel)
+        theConf->SetBlob("MainWindow/FileTree_Columns", m_pTreeView->header()->saveState());
 }
 
 void CFileView::SetBox(const CSandBoxPtr& pBox)
@@ -66,12 +63,18 @@ void CFileView::SetBox(const CSandBoxPtr& pBox)
     //    m_pTreeView->setEnabled(true);
 
     if (m_pFileModel) {
+        SaveState();
+
         delete m_pFileModel;
         m_pFileModel = NULL;
     }
     if (!Root.isEmpty()) {
         m_pFileModel = new QFileSystemModel(this);
         m_pFileModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Files | QDir::Hidden | QDir::System);
+
+        QByteArray Columns = theConf->GetBlob("MainWindow/FileTree_Columns");
+	    if (!Columns.isEmpty())
+		    m_pTreeView->header()->restoreState(Columns);
     }
     m_pTreeView->setModel(m_pFileModel);