diff --git a/src/js/components/FollowButton.js b/src/js/components/FollowButton.js
index cc56ede1..e44d09c9 100755
--- a/src/js/components/FollowButton.js
+++ b/src/js/components/FollowButton.js
@@ -41,7 +41,7 @@ class FollowButton extends React.Component{
 		}
 
 		// Loader
-		if (helpers.isLoading(this.props.load_queue,['*/following*','/followers*','*/contains*'])){
+		if (helpers.isLoading(this.props.load_queue,['/following','/followers','me/albums/contains/?ids=','me/albums/?ids='])){
 			className += ' working'
 		}
 
diff --git a/src/js/helpers.js b/src/js/helpers.js
index 47d864f7..e055b035 100755
--- a/src/js/helpers.js
+++ b/src/js/helpers.js
@@ -466,7 +466,7 @@ export let isLoading = function(load_queue = [], keys = []){
 
 			// Loop all the keys we're looking for
 			for (var i = 0; i < keys.length; i++){
-				if (load_queue[load_queue_key].startsWith(keys[i])){
+				if (load_queue[load_queue_key].includes(keys[i])){
 					return true
 				}
 			}
diff --git a/src/scss/global/_forms.scss b/src/scss/global/_forms.scss
index b778319a..5e138b4d 100755
--- a/src/scss/global/_forms.scss
+++ b/src/scss/global/_forms.scss
@@ -175,7 +175,7 @@ input[type="submit"] {
 			position: absolute;
 			display: block;
 			content: '';
-			background: rgba(175,175,175,0.2);
+			background: rgba(0,0,0,0.15);
 			opacity: 1;
 		    animation: slideloader 1s infinite;
 			top: 0;
@@ -184,6 +184,12 @@ input[type="submit"] {
 			left: 0;
 			z-index: 1;
 		}
+
+		&.white {
+			&:after {
+				background: rgba(255,255,255,0.5);
+			}
+		}
 	}
 
 	&.context-menu-trigger {