diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 789ca1259..a4272a3d0 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -1409,6 +1409,7 @@ void MainWindow::Clear()
 
 void MainWindow::FullParseFile()
 {
+    toolOptions->ClearPropertyBrowser();
     try
     {
         SetEnabledGUI(true);
diff --git a/src/app/widgets/vtooloptionspropertybrowser.cpp b/src/app/widgets/vtooloptionspropertybrowser.cpp
index 95965b7fc..b3cae144e 100644
--- a/src/app/widgets/vtooloptionspropertybrowser.cpp
+++ b/src/app/widgets/vtooloptionspropertybrowser.cpp
@@ -60,6 +60,15 @@ VToolOptionsPropertyBrowser::VToolOptionsPropertyBrowser(QDockWidget *parent)
     connect(PropertyModel, &VPropertyModel::onDataChangedByEditor, this, &VToolOptionsPropertyBrowser::userChangedData);
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void VToolOptionsPropertyBrowser::ClearPropertyBrowser()
+{
+    PropertyModel->clear();
+    propertyToId.clear();
+    idToProperty.clear();
+    currentItem = nullptr;
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void VToolOptionsPropertyBrowser::ShowItemOptions(QGraphicsItem *item)
 {
diff --git a/src/app/widgets/vtooloptionspropertybrowser.h b/src/app/widgets/vtooloptionspropertybrowser.h
index e558b46ca..1c4c65fa1 100644
--- a/src/app/widgets/vtooloptionspropertybrowser.h
+++ b/src/app/widgets/vtooloptionspropertybrowser.h
@@ -46,6 +46,7 @@ class VToolOptionsPropertyBrowser : public QObject
     Q_OBJECT
 public:
     VToolOptionsPropertyBrowser(QDockWidget *parent);
+    void ClearPropertyBrowser();
 public slots:
     void itemClicked(QGraphicsItem *item);
     void userChangedData(VPE::VProperty* property);