diff --git a/CHANGELOG.md b/CHANGELOG.md
index 483500e..60e2611 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Vue 3
 
+## v2.3.1
+
+- Fix [Issue 26](https://github.com/motla/vue-document-editor/issues/26)
+
 ## v2.3.0
 
 - Improvement on [Issue 28](https://github.com/motla/vue-document-editor/issues/28): Table Page Break. Now table rows don't split over pages but are simply moved if they overflow
@@ -76,6 +80,10 @@
 
 # Vue 2
 
+## v1.5.1
+
+- Fix [Issue 26](https://github.com/motla/vue-document-editor/issues/26)
+
 ## v1.5.0
 
 - Improvement on [Issue 28](https://github.com/motla/vue-document-editor/issues/28): Table Page Break. Now table rows don't split over pages but are simply moved if they overflow
diff --git a/src/DocumentEditor/DocumentEditor.vue b/src/DocumentEditor/DocumentEditor.vue
index a4f43e6..a027a88 100644
--- a/src/DocumentEditor/DocumentEditor.vue
+++ b/src/DocumentEditor/DocumentEditor.vue
@@ -474,6 +474,9 @@ export default {
         page.elt.style.position = "relative";
         page.elt.style.padding = (typeof this.page_margins == "function") ? this.page_margins(page_idx + 1, this.pages.length) : this.page_margins;
         page.elt.style.breakBefore = page_idx ? "page" : "auto";
+        page.elt.style.width = "calc("+this.page_format_mm[0]+"mm - 2px)";
+        page.elt.style.height = "calc("+this.page_format_mm[1]+"mm - 2px)";
+        page.elt.style.boxSizing = "border-box";
         page.elt.style.overflow = "hidden";
 
         // add overlays if any