diff --git a/Windows/MainForm.cs b/Windows/MainForm.cs
index 8969055..d1eb4d8 100644
--- a/Windows/MainForm.cs
+++ b/Windows/MainForm.cs
@@ -348,6 +348,8 @@ namespace NBTExplorer.Windows
             if (_searchForm.ShowDialog(this) == DialogResult.Cancel) {
                 worker.Cancel();
                 _searchState = null;
+
+                UpdateUI();
             }
 
             t.Join();
@@ -375,6 +377,9 @@ namespace NBTExplorer.Windows
                 _searchForm = null;
             }
 
+            _searchState = null;
+            UpdateUI();
+
             MessageBox.Show("End of results");
         }