diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
index 3a6fc0d21..76a0879e3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/components/forms.scss
@@ -297,7 +297,7 @@ button.icon{
     > li{
         position:relative;
         background-color:white;
-        padding:1em 1.5em;
+        padding:1em 10em 1em 1.5em; /* 10em padding leaves room for controls */
         margin-bottom:1em;
         border:1px solid lighten($color-grey-4, 3%); /* really trying to avoid creating more greys, but this one is better than grey 4 or 5 */
         @include border-radius(2px);
@@ -319,6 +319,7 @@ button.icon{
     /* Object controls */
     .controls{
         position:absolute;
+        z-index:1;
         right:1em;
         top:1em;
         color:white;