diff --git a/profiler_gui/descriptors_tree_widget.cpp b/profiler_gui/descriptors_tree_widget.cpp
index 4e8080c..53773a2 100644
--- a/profiler_gui/descriptors_tree_widget.cpp
+++ b/profiler_gui/descriptors_tree_widget.cpp
@@ -320,7 +320,7 @@ void EasyDescTreeWidget::keyPressEvent(QKeyEvent* _event)
 
 //////////////////////////////////////////////////////////////////////////
 
-void EasyDescTreeWidget::clearSilent(bool)
+void EasyDescTreeWidget::clearSilent(bool _global)
 {
     const QSignalBlocker b(this);
 
@@ -333,7 +333,13 @@ void EasyDescTreeWidget::clearSilent(bool)
     ::std::vector<QTreeWidgetItem*> topLevelItems;
     topLevelItems.reserve(topLevelItemCount());
     for (int i = topLevelItemCount() - 1; i >= 0; --i)
-        topLevelItems.push_back(takeTopLevelItem(i));
+    {
+        const bool expanded = !_global && topLevelItem(i)->isExpanded();
+        auto item = takeTopLevelItem(i);
+        if (expanded)
+            m_expandedFilesTemp.insert(item->text(DESC_COL_FILE_LINE).toStdString());
+        topLevelItems.push_back(item);
+    }
 
     auto deleter_thread = ::std::thread([](decltype(topLevelItems) _items) {
         for (auto item : _items)
@@ -364,7 +370,7 @@ void EasyDescTreeWidget::build()
     f.setBold(true);
 
     typedef ::std::unordered_map<::std::string, FileItems> Files;
-    Files m_files;
+    Files fileItems;
 
     m_items.resize(EASY_GLOBALS.descriptors.size());
     memset(m_items.data(), 0, sizeof(void*) * m_items.size());
@@ -375,7 +381,7 @@ void EasyDescTreeWidget::build()
     {
         if (desc != nullptr)
         {
-            auto& p = m_files[desc->file()];
+            auto& p = fileItems[desc->file()];
             if (p.item == nullptr)
             {
                 p.item = new QTreeWidgetItem();
@@ -418,11 +424,14 @@ void EasyDescTreeWidget::build()
         ++id;
     }
 
-    for (auto& p : m_files)
+    for (auto& p : fileItems)
     {
         addTopLevelItem(p.second.item);
+        if (m_expandedFilesTemp.find(p.first) != m_expandedFilesTemp.end())
+            p.second.item->setExpanded(true);
     }
 
+    m_expandedFilesTemp.clear();
     setSortingEnabled(true);
     sortByColumn(DESC_COL_FILE_LINE, Qt::AscendingOrder);
     resizeColumnsToContents();
@@ -780,7 +789,8 @@ void EasyDescWidget::keyPressEvent(QKeyEvent* _event)
 
 void EasyDescWidget::build()
 {
-    clear();
+    m_tree->clearSilent(false);
+    m_foundNumber->setText(QString("Found 0 matches"));
     m_tree->build();
 }
 
diff --git a/profiler_gui/descriptors_tree_widget.h b/profiler_gui/descriptors_tree_widget.h
index 35980ad..4724726 100644
--- a/profiler_gui/descriptors_tree_widget.h
+++ b/profiler_gui/descriptors_tree_widget.h
@@ -49,6 +49,7 @@
 #include <QTreeWidget>
 #include <QString>
 #include <vector>
+#include <unordered_set>
 #include "easy/profiler.h"
 
 //////////////////////////////////////////////////////////////////////////
@@ -88,14 +89,16 @@ class EasyDescTreeWidget : public QTreeWidget
     typedef EasyDescTreeWidget   This;
 
     typedef ::std::vector<EasyDescWidgetItem*> Items;
+    typedef ::std::unordered_set<::std::string> ExpandedFiles;
 
 protected:
 
-    Items                 m_items;
-    QString          m_lastSearch;
-    QTreeWidgetItem*  m_lastFound;
-    int            m_searchColumn;
-    bool                m_bLocked;
+    ExpandedFiles    m_expandedFilesTemp;
+    Items                        m_items;
+    QString                 m_lastSearch;
+    QTreeWidgetItem*         m_lastFound;
+    int                   m_searchColumn;
+    bool                       m_bLocked;
 
 public: