diff --git a/public/src/forum/topic/threadTools.js b/public/src/forum/topic/threadTools.js
index c938cc132f..41fe770bf7 100644
--- a/public/src/forum/topic/threadTools.js
+++ b/public/src/forum/topic/threadTools.js
@@ -78,7 +78,12 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move'], func
 
 				setFollowState(state);
 
-				app.alertSuccess(state ? '[[topic:following_topic.message]]' : '[[topic:not_following_topic.message]]');
+				app.alert({
+					alert_id: 'follow_thread',
+					message: state ? '[[topic:following_topic.message]]' : '[[topic:not_following_topic.message]]',
+					type: 'success',
+					timeout: 5000
+				});
 			});
 
 			return false;
diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
index 0308bcf97b..9cf301f5af 100644
--- a/public/src/modules/alerts.js
+++ b/public/src/modules/alerts.js
@@ -62,7 +62,7 @@ define('alerts', function() {
 		alert.find('p').html(params.message);
 		alert.attr('class', 'alert alert-dismissable alert-' + params.type);
 
-		clearTimeout(alert.attr('timeoutId'));
+		clearTimeout(parseInt(alert.attr('timeoutId'), 10));
 		startTimeout(alert, params.timeout);
 
 		alert.children().fadeOut(100);