diff --git a/src/PostIt/PostIt/Controls/MarkdownEditorControl.axaml.cs b/src/PostIt/PostIt/Controls/MarkdownEditorControl.axaml.cs
index 2538f7168..0431b726e 100644
--- a/src/PostIt/PostIt/Controls/MarkdownEditorControl.axaml.cs
+++ b/src/PostIt/PostIt/Controls/MarkdownEditorControl.axaml.cs
@@ -38,6 +38,8 @@ public partial class MarkdownEditorControl : UserControl
     {
         InitializeComponent();
         PropertyChanged += OnPropertyChanged;
+        SizeChanged += OnSizeChanged;
+        UpdateEditorLimits();
     }
 
     private void OnPropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
@@ -60,4 +62,27 @@ public partial class MarkdownEditorControl : UserControl
             }
         }
     }
+
+    private void OnSizeChanged(object? sender, SizeChangedEventArgs e)
+    {
+        UpdateEditorLimits();
+    }
+
+    private void UpdateEditorLimits()
+    {
+        var visibleHeight = Bounds.Height > 0 ? Bounds.Height - 24 : 260;
+        visibleHeight = Math.Max(visibleHeight, 80);
+
+        if (SourceEditor is not null)
+        {
+            SourceEditor.MaxHeight = visibleHeight;
+            SourceEditor.Height = double.NaN;
+        }
+
+        if (PreviewViewer is not null)
+        {
+            PreviewViewer.MaxHeight = visibleHeight;
+            PreviewViewer.Height = double.NaN;
+        }
+    }
 }