diff --git a/MainWindow.axaml.cs b/MainWindow.axaml.cs
index c58a032..ad07b2a 100644
--- a/MainWindow.axaml.cs
+++ b/MainWindow.axaml.cs
@@ -212,6 +212,11 @@ public partial class MainWindow : Window
     
 
     private async void NavTree_SelectionChanged(object? sender, SelectionChangedEventArgs e)
+    {
+        ReloadWikiItem();
+    }
+
+    private async void ReloadWikiItem()
     {
         if (NavTree.SelectedItem is TreeViewItem t && t.Tag is WikiItem item && !item.IsFolder)
         {
@@ -255,6 +260,8 @@ public partial class MainWindow : Window
                 ExpandAndFindNode(nodes, selectPath, out var selectedNode) &&
                 selectedNode != null)
                 NavTree.SelectedItem = selectedNode;
+            
+            ReloadWikiItem();
         }catch (Exception ex)
         {
             Logger.Log($"Error while populating nav tree: {ex.Message}", Logger.LogType.Error);
@@ -494,7 +501,13 @@ public partial class MainWindow : Window
             return;
         }
 
+        var editedWikiFilePath = _selectedWikiFilePath;
         EditorWindow ew = new(_selectedWikiFilePath);
+        ew.Closed += (_, _) =>
+        {
+            if (!string.IsNullOrWhiteSpace(editedWikiFilePath) && File.Exists(editedWikiFilePath))
+                PopulateNavTree(editedWikiFilePath, editedWikiFilePath);
+        };
         ew.Show();
 
         //await MessageBox.Show(this, "Edit feature is currently disabled.", "Edit Disabled");
diff --git a/Wiki/EditorWindow.axaml.cs b/Wiki/EditorWindow.axaml.cs
index e0fe836..8078b12 100644
--- a/Wiki/EditorWindow.axaml.cs
+++ b/Wiki/EditorWindow.axaml.cs
@@ -35,7 +35,7 @@ public partial class EditorWindow : Window
         try
         {
             File.WriteAllText(filename, TbContent.Text);
-            MainWindow._instance.PopulateNavTree();
+            MainWindow._instance.PopulateNavTree(filename, filename);
         }
         catch (Exception ex)
         {