diff --git a/settings/js/apps.js b/settings/js/apps.js
index d4d10ddc951..c8001822083 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -74,8 +74,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		if (this._loadCategoryCall) {
 			this._loadCategoryCall.abort();
 		}
+
+		$('#app-content').addClass('icon-loading');
 		$('#apps-list')
-			.addClass('icon-loading')
 			.removeClass('hidden')
 			.html('');
 		$('#apps-list-empty').addClass('hidden');
@@ -166,7 +167,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 				});
 			},
 			complete: function() {
-				$('#apps-list').removeClass('icon-loading');
+				$('#app-content').removeClass('icon-loading');
 			}
 		});
 	},
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 817856717a0..ed842bb2ca9 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -191,11 +191,11 @@ script(
 
 	</ul>
 </div>
-<div id="app-content">
+<div id="app-content" class="icon-loading">
 	<svg class="app-filter">
 		<defs><filter id="invertIcon"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
 	</svg>
-	<div id="apps-list" class="icon-loading"></div>
+	<div id="apps-list"></div>
 	<div id="apps-list-empty" class="hidden emptycontent emptycontent-search">
 		<div class="icon-search"></div>
 		<h2><?php p($l->t('No apps found for your version')) ?></h2>