diff --git a/public/src/client/topic/threadTools.js b/public/src/client/topic/threadTools.js
index 69c8fad673..7f6c2a773c 100644
--- a/public/src/client/topic/threadTools.js
+++ b/public/src/client/topic/threadTools.js
@@ -112,6 +112,7 @@ define('forum/topic/threadTools', ['forum/topic/fork', 'forum/topic/move', 'comp
 				templates.parse('partials/topic/topic-menu-list', data, function(html) {
 					translator.translate(html, function(html) {
 						dropdownMenu.html(html);
+						$(window).trigger('action:topic.tools.load');
 					});
 				});
 			});
diff --git a/src/posts/edit.js b/src/posts/edit.js
index 2eca8a8328..ea7686fb20 100644
--- a/src/posts/edit.js
+++ b/src/posts/edit.js
@@ -86,7 +86,7 @@ module.exports = function(Posts) {
 
 	function editMainPost(data, postData, callback) {
 		var tid = postData.tid;
-		var title = data.title.trim();
+		var title = data.title ? data.title.trim() : '';
 
 		async.parallel({
 			topic: function(next) {