diff --git a/scss/edit-form/_layout.scss b/scss/edit-form/_layout.scss
index 986b7ce..07a0e7a 100644
--- a/scss/edit-form/_layout.scss
+++ b/scss/edit-form/_layout.scss
@@ -12,7 +12,7 @@
 
 
     // Tabstrip
-    .k-edit-form-container .k-tabstrip {
+    .k-edit-form-container .k-tabstrip-wrapper {
         margin: (-$window-inner-padding-y) (-$window-inner-padding-x);
     }
     .k-edit-form-container .k-tabstrip.k-root-tabs {
diff --git a/scss/editor/_layout.scss b/scss/editor/_layout.scss
index d6b9a09..7c31a9f 100644
--- a/scss/editor/_layout.scss
+++ b/scss/editor/_layout.scss
@@ -390,6 +390,30 @@
 @include exports( "editor/table-wizard/layout" ) {
 
     .k-editor-table-wizard-dialog {
+        display: flex;
+
+        // Edit form
+        .k-edit-form-container {
+            display: flex;
+            flex-direction: column;
+            flex: 1 1 auto;
+        }
+
+        // Tabstrip wrapper
+        .k-tabstrip-wrapper {
+            display: flex;
+            flex: 1 1 auto;
+            overflow: auto;
+
+            .k-tabstrip.k-root-tabs {
+                flex: 1 1 auto;
+                margin-bottom: 0;
+            }
+        }
+
+        .k-edit-field > .k-checkbox {
+            position: relative; // fix scrolling
+        }
 
         // Generic widgets
         .k-numerictextbox {
@@ -409,6 +433,10 @@
             vertical-align: middle;
         }
 
+        .k-edit-field > .k-checkbox {
+            position: relative; // fix scrolling
+        }
+
 
         // Align
         .k-dropdown.k-align {