diff --git a/src/css/easymde.css b/src/css/easymde.css
index 4e3190b..5e5dc11 100644
--- a/src/css/easymde.css
+++ b/src/css/easymde.css
@@ -256,7 +256,6 @@
 .editor-preview-active-side--no-fullscreen {
     height: auto;
     position: static;
-    min-height: calc(300px + 22px);
     float: right;
 }
 
diff --git a/src/js/easymde.js b/src/js/easymde.js
index dd8fb79..2e7daa2 100644
--- a/src/js/easymde.js
+++ b/src/js/easymde.js
@@ -2257,6 +2257,11 @@ EasyMDE.prototype.createSideBySide = function () {
     if (!preview || !/editor-preview-side/.test(preview.className)) {
         preview = document.createElement('div');
         preview.className = 'editor-preview-side';
+        var optionsMinHeight = parseInt(this.options.minHeight);
+        var paddingTop = parseInt(window.getComputedStyle(wrapper).paddingTop);
+        var borderTopWidth = parseInt(window.getComputedStyle(wrapper).borderTopWidth);
+        var minHeight = optionsMinHeight + paddingTop * 2 + borderTopWidth * 2;
+        preview.style.minHeight =  minHeight.toString() + 'px';
 
         if (this.options.previewClass) {