diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
index f0920723695aa6143f95be6adca748d7cfd456f2..7682d64eca6108786c7959de58930badf5ee1f21 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/users/views/EmojiGrid.as
@@ -66,7 +66,7 @@ package org.bigbluebutton.modules.users.views {
 				button.toggle = true;
 				button.setStyle("icon", images["emoji_" + emoji]);
 				button.selected = (UserManager.getInstance().getConference().myEmojiStatus == emoji);
-				button.enabled = !button.selected;
+				button.toggle = button.selected;
 				button.toolTip = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.' + emoji);
 				addEventListener(MouseEvent.CLICK, buttonMouseEventHandler);
 				tile.addChild(button);
@@ -85,9 +85,14 @@ package org.bigbluebutton.modules.users.views {
 		}
 		
 		protected function buttonMouseEventHandler(event:MouseEvent):void {
-			var emoji:String = String(event.target.id).replace("btn", "");
-			var e:EmojiStatusEvent = new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, emoji);
-			dispatcher.dispatchEvent(e);
+			var clickedButton:Button = event.target as Button;
+			if (!clickedButton.toggle) {
+				var emoji:String = String(event.target.id).replace("btn", "");
+				var e:EmojiStatusEvent = new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, emoji);
+				dispatcher.dispatchEvent(e);
+			} else {
+				dispatcher.dispatchEvent(new EmojiStatusEvent(EmojiStatusEvent.EMOJI_STATUS, "none"));
+			}
 			hide();
 		}