diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 91a0d0fb83..8ec6b7ca2d 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -26,7 +26,6 @@ define('composer', [
 	$(window).on('action:composer.topics.post', function(ev, data) {
 		localStorage.removeItem('category:' + data.data.cid + ':bookmark');
 		localStorage.removeItem('category:' + data.data.cid + ':bookmark:clicked');
-		ajaxify.go('topic/' + data.data.slug);
 	});
 
 	$(window).on('popstate', function(ev, data) {
@@ -549,6 +548,12 @@ define('composer', [
 			discard(post_uuid);
 			drafts.removeDraft(postData.save_id);
 
+			if (action === 'topics.post') {
+				ajaxify.go('topic/' + data.slug);
+			} else {
+				removeComposerHistory();
+			}
+
 			$(window).trigger('action:composer.' + action, {composerData: composerData, data: data});
 		});
 	}