diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index ef1596e7b5..9087cea82e 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -51,9 +51,13 @@
 window.onload = function(){
 	new EmojiPicker({
 		trigger: [
+			{
+				selector: '.emojis-post',
+				insertInto: ['#comment-edit-text-0', '#profile-jot-text']
+			},
 			{
 				selector: '.emojis',
-				insertInto: ['#comment-edit-text-0', '#profile-jot-text', '.comment-edit-text-full']
+				insertInto: ['.comment-edit-text-full']
 			}
 		],
 		closeButton: true
diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl
index 52d95531d7..07824c6e32 100644
--- a/view/templates/jot.tpl
+++ b/view/templates/jot.tpl
@@ -52,7 +52,7 @@
 		<a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
 	</div>
 	<div id="profile-emojis-wrapper" style="display: {{$visitor}};">
-		<a id="profile-emojis" class="icon icon-smile emojis" title="{{$edemojis}}"></a>
+		<a id="profile-emojis" class="icon icon-smile emojis-post" title="{{$edemojis}}"></a>
 	</div>
 	<div id="post-length">
 		<span id="character-counter" class="grey"></span>