diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
index fe16016bd..21ef8dbce 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.html
@@ -24,8 +24,10 @@
     </div>
 
     <div class="modal-footer">
-        <button type="reset" class="float-left btn btn-secondary" (click)="cancel()" [disabled]="editFormSubmitted">Cancel</button>
-        <button type="submit" class="float-right btn btn-primary">Save</button>
+        <div class="clearfix">
+            <button type="reset" class="float-left btn btn-secondary" (click)="cancel()" [disabled]="editFormSubmitted">Cancel</button>
+            <button type="submit" class="float-right btn btn-primary">Save</button>
+        </div>
     </div>
 </form>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss
index f016991ef..2205232de 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss
@@ -7,4 +7,8 @@
 
 .nav-tabs {
     border: 0;
+}
+
+.clearfix {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/dialog-renderer.component.html b/src/Squidex/app/framework/angular/dialog-renderer.component.html
index 958e422e3..cecaae279 100644
--- a/src/Squidex/app/framework/angular/dialog-renderer.component.html
+++ b/src/Squidex/app/framework/angular/dialog-renderer.component.html
@@ -11,8 +11,10 @@
             </div>
 
             <div class="modal-footer">
-                <button type="button" class="btn btn-danger" (click)="confirm()">Yes</button>
-                <button type="button" class="btn btn-secondary" (click)="cancel()">No</button>
+                <div class="clearfix">
+                    <button type="button" class="float-left btn btn-secondary" (click)="cancel()">No</button>
+                    <button type="button" class="float-right btn btn-danger" (click)="confirm()">Yes</button>
+                </div>
             </div>
         </div>
     </div>
diff --git a/src/Squidex/app/framework/angular/dialog-renderer.component.scss b/src/Squidex/app/framework/angular/dialog-renderer.component.scss
index e4d5246c6..f17a55323 100644
--- a/src/Squidex/app/framework/angular/dialog-renderer.component.scss
+++ b/src/Squidex/app/framework/angular/dialog-renderer.component.scss
@@ -25,4 +25,8 @@
     &-bottomleft {
         @include fixed(auto, auto, 0, 0);
     }
+}
+
+.clearfix {
+    width: 100%;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/jscript-editor.component.scss b/src/Squidex/app/framework/angular/jscript-editor.component.scss
index 07b2c640b..63520eebd 100644
--- a/src/Squidex/app/framework/angular/jscript-editor.component.scss
+++ b/src/Squidex/app/framework/angular/jscript-editor.component.scss
@@ -4,5 +4,5 @@
 .editor {
     background: $color-dark-foreground;
     border: 1px solid $color-input;
-    height: 30rem;
+    height: 20rem;
 }
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/json-editor.component.scss b/src/Squidex/app/framework/angular/json-editor.component.scss
index 07b2c640b..63520eebd 100644
--- a/src/Squidex/app/framework/angular/json-editor.component.scss
+++ b/src/Squidex/app/framework/angular/json-editor.component.scss
@@ -4,5 +4,5 @@
 .editor {
     background: $color-dark-foreground;
     border: 1px solid $color-input;
-    height: 30rem;
+    height: 20rem;
 }
\ No newline at end of file