diff --git a/src/aui-form-builder/js/aui-form-builder-field-types.js b/src/aui-form-builder/js/aui-form-builder-field-types.js
index 4f251b755be..1632e6e170c 100644
--- a/src/aui-form-builder/js/aui-form-builder-field-types.js
+++ b/src/aui-form-builder/js/aui-form-builder-field-types.js
@@ -340,7 +340,7 @@ A.FormBuilderFieldTypes.prototype = {
             modal: true,
             resizable: false,
             visible: false,
-            zIndex: 3
+            zIndex: 4
         });
 
         fieldTypesModal.addTarget(this);
diff --git a/src/aui-form-builder/js/aui-form-builder-settings-modal.js b/src/aui-form-builder/js/aui-form-builder-settings-modal.js
index e7413547c8e..2da2473f569 100644
--- a/src/aui-form-builder/js/aui-form-builder-settings-modal.js
+++ b/src/aui-form-builder/js/aui-form-builder-settings-modal.js
@@ -127,7 +127,7 @@ A.FormBuilderSettingsModal = A.Base.create('form-builder-settings-modal', A.Base
             modal: true,
             headerContent: this.TPL_FIELD_SETTINGS_HEAD_CONTENT,
             resizable: false,
-            zIndex: 3
+            zIndex: 4
         }).render();
 
         this._modal.addToolbar(
diff --git a/src/aui-layout/HISTORY.md b/src/aui-layout/HISTORY.md
index e70fe83de9f..5191f039a98 100644
--- a/src/aui-layout/HISTORY.md
+++ b/src/aui-layout/HISTORY.md
@@ -5,6 +5,7 @@
 ## @VERSION@
 
 * [AUI-2030](https://issues.liferay.com/browse/AUI-2030) A row with one col should be automatically added on last position when the last row have at least one field
+* [AUI-2036](https://issues.liferay.com/browse/AUI-2036) AUI Form Builder Field Settings Modal should not overwrite Bootstrap 3 Modal css rules so that the layout keeps as similar as possible
 * [AUI-2031](https://issues.liferay.com/browse/AUI-2031) JavaScript error thrown when trying to split a row into two columns
 * [AUI-2016](https://issues.liferay.com/browse/AUI-2016) Remove column delete button from From Builder
 * [AUI-1930](https://issues.liferay.com/browse/AUI-1930) Change functionality of add cols
diff --git a/src/aui-layout/assets/aui-layout-builder-remove-row-core.css b/src/aui-layout/assets/aui-layout-builder-remove-row-core.css
index c2ea416ed0d..6b5716b60f5 100644
--- a/src/aui-layout/assets/aui-layout-builder-remove-row-core.css
+++ b/src/aui-layout/assets/aui-layout-builder-remove-row-core.css
@@ -3,5 +3,5 @@
     position: absolute;
     right: -10px;
     top: -10px;
-    z-index: 1;
+    z-index: 3;
 }
\ No newline at end of file