diff --git a/modules/system/assets/ui/less/loader.less b/modules/system/assets/ui/less/loader.less
index b18b1145e..4613a5d07 100644
--- a/modules/system/assets/ui/less/loader.less
+++ b/modules/system/assets/ui/less/loader.less
@@ -17,6 +17,7 @@
     color: @color-loading-indicator-text;
     font-size: 14px;
     font-weight: 500;
+    background: @body-bg;
     text-align: left;
     z-index: @zindex-loader;
 
@@ -32,10 +33,6 @@
     }
 }
 
-.form-buttons .loading-indicator {
-    background: @body-bg;
-}
-
 .loading-indicator-container {
     position: relative;
     min-height: 40px;
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index b334e826d..ced854985 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -2439,9 +2439,8 @@ textarea.input-group-sm > .form-control,textarea.input-group-sm > .input-group-a
 .input-group-btn > .btn:hover,.input-group-btn > .btn:focus,.input-group-btn > .btn:active{z-index:10}
 .input-group-btn:first-child > .btn,.input-group-btn:first-child > .btn-group{margin-right:-1px}
 .input-group-btn:last-child > .btn,.input-group-btn:last-child > .btn-group{margin-left:-1px}
-.loading-indicator{padding:20px 20px 20px 60px;color:#999999;font-size:14px;font-weight:500;text-align:left;z-index:10}
+.loading-indicator{padding:20px 20px 20px 60px;color:#999999;font-size:14px;font-weight:500;background:#f9f9f9;text-align:left;z-index:10}
 .loading-indicator > span{background:transparent url('images/loader.gif') no-repeat 0 50%;position:absolute;width:40px;height:40px;top:50%;margin-top:-20px;left:0;display:block}
-.form-buttons .loading-indicator{background:#f9f9f9}
 .loading-indicator-container{position:relative;min-height:40px}
 .loading-indicator-container .loading-indicator{position:absolute;left:0;top:0;width:100%;height:100%;padding-top:0}
 .loading-indicator-container .loading-indicator > div{position:absolute;top:50%;margin-top:-0.65em}