diff --git a/file/js/be.bastelstu.Chat.coffee b/file/js/be.bastelstu.Chat.coffee
index f067331..92fcf9f 100644
--- a/file/js/be.bastelstu.Chat.coffee
+++ b/file/js/be.bastelstu.Chat.coffee
@@ -252,6 +252,12 @@ window.console ?=
 					$('.timsChatMessage').addClass 'unloaded', 800
 					@handleMessages data.messages
 					document.title = @titleTemplate.fetch data
+					
+					# Fix smiley urls ...
+					$('#smilies .menu li a').each (key, value) ->
+						anchor = $(value)
+						anchor.attr 'href', anchor.attr('href').replace /.*#/, "#{target.attr('href')}#"
+	  
 				, @
 				error: () ->
 					# Reload the page to change the room the old fashion-way
diff --git a/template/chat.tpl b/template/chat.tpl
index 96d03a8..3e81d86 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -104,31 +104,8 @@
 	
 	<div id="timsChatControls" class="marginTop">
 		{if MODULE_SMILEY}
-			{capture assign=__defaultSmilies}
-				{include file='__messageFormSmilies' smilies=$defaultSmilies}
-			{/capture}
-			
-			<div id="smilies" class="smiliesContent tabMenuContent container {if $smileyCategories|count} tabMenuContainer{/if}" data-store="activeTabMenuItem" data-active="smilies-default">
-				{if $smileyCategories|count}
-					<nav class="menu">
-						<ul>
-							<li><a href="#smilies-default">{lang}wcf.smilies.default{/lang}</a></li>
-							{foreach from=$smileyCategories item=smileyCategory}
-								<li><a href="#smilies-{@$smileyCategory->smileyCategoryID}" data-smiley-category-id="{@$smileyCategory->smileyCategoryID}">{$smileyCategory->title|language}</a></li>
-							{/foreach}
-						</ul>
-					</nav>
-					
-					<div id="smilies-default" class="hidden">
-						{@$__defaultSmilies}
-					</div>
-					
-					{foreach from=$smileyCategories  item='smileyCategory'}
-						<div id="smilies-{$smileyCategory->smileyCategoryID}" class="hidden"></div>
-					{/foreach}
-				{else}
-					{@$__defaultSmilies}
-				{/if}
+			<div class="tabMenuContainer">
+				{include file='messageFormSmilies' wysiwygSelector=''}
 			</div>
 		{/if}
 		<nav id="timsChatOptions">