diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 3a0e9d2d57..7e2721f3aa 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -439,13 +439,11 @@ define('composer', [
 	}
 
 	function focusElements(postContainer) {
-		var title = postContainer.find('.title'),
-			bodyEl = postContainer.find('textarea');
-
-		if (title.is(':disabled')) {
-			bodyEl.focus().putCursorAtEnd();
-		} else {
+		var title = postContainer.find('input.title');
+		if (title.length) {
 			title.focus();
+		} else {
+			postContainer.find('textarea').focus().putCursorAtEnd();
 		}
 	}