diff --git a/app/views/global_issue_templates/index.html.erb b/app/views/global_issue_templates/index.html.erb
index 8022892..35beee9 100644
--- a/app/views/global_issue_templates/index.html.erb
+++ b/app/views/global_issue_templates/index.html.erb
@@ -36,9 +36,13 @@
     <% @global_issue_templates.each do |issue_template| %>
         <tr class="<%= cycle("odd", "even") %> issue_template issue">
           <td><%= link_to h(issue_template.id),  {:controller => 'global_issue_templates',
-                                                  :id => issue_template.id, :action => 'show'}, title: issue_template.title, tooltip: issue_template.note %></td>
+                                                  :id => issue_template.id, :action => 'show'},
+                          title: issue_template.title, tooltip: issue_template.note %></td>
           <td><%= link_to h(issue_template.title),  {:controller => 'global_issue_templates',
-                                                     :id => issue_template.id, :action => 'show'}, title: textilizable(issue_template.description), class: "template_tooltip" %></td>
+                                                      :id => issue_template.id, :action => 'show'},
+                           title: "#{html_escape(issue_template.note)}" %>
+            <a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
+               onclick="checkExpand('global_template_description-<%= issue_template.id %>');"></a></td>
           <td><%=h issue_template.tracker.name %></td>
           <td><%=h issue_template.author %></td>
           <td><%= format_time(issue_template.updated_on)%> </td>
@@ -65,6 +69,10 @@
               </td>
           <% end %>
         </tr>
+        <tr class="<%= current_cycle %>" style="display: none;" id="global_template_description-<%= issue_template.id %>">
+          <td class="description" colspan="8">
+            <div class="wiki"><%= textilizable(issue_template.description) %></div></td>
+        </tr>
     <% end %>
     </tbody>
   </table>
diff --git a/app/views/issue_templates/index.html.erb b/app/views/issue_templates/index.html.erb
index 01abf93..7d02154 100644
--- a/app/views/issue_templates/index.html.erb
+++ b/app/views/issue_templates/index.html.erb
@@ -48,7 +48,11 @@
                  :action => 'show', :id => issue_template.id, :project_id => @project}, {:title => issue_template.note } %></td>
         <td><%= link_to h(issue_template.title),  {:controller => 'issue_templates',
                  :id => issue_template.id, :action => 'show'},
-                 title: "#{html_escape(issue_template.note)}", class: "template_tooltip" %></td>
+                 title: "#{html_escape(issue_template.note)}" %>
+
+          <a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
+             onclick="checkExpand('template_description-<%= issue_template.id %>');"></a>
+        </td>
         <td><%=h issue_template.tracker.name %></td>
         <td><%=h issue_template.author %></td>
         <td><%= format_time(issue_template.updated_on)%> </td>
@@ -76,6 +80,11 @@
         </td>
       <% end %>
       </tr>
+      <tr class="<%= current_cycle %>" style="display: none;" id="template_description-<%= issue_template.id %>">
+        <td class="description" colspan="8">
+          <div class="wiki"><%= textilizable(issue_template.description) %></div></td>
+      </tr>
+
     <% end %>
   </tbody>
 </table>
@@ -105,16 +114,23 @@
                 <td><%= link_to h(issue_template.id),  {:controller => 'issue_templates',
                       :action => 'show', :id => issue_template.id,
                       :project_id => issue_template.project_id }, {:title => issue_template.note } %></td>
-
                 <td><%= link_to h(issue_template.title),  {:controller => 'issue_templates',
-                      :id => issue_template.id, :action => 'show'},
-                      title: textilizable(issue_template.description), class: "template_tooltip" %></td>td>
+                                                           :id => issue_template.id, :action => 'show'},
+                                title: "#{html_escape(issue_template.note)}" %>
+
+                  <a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
+                     onclick="checkExpand('template_description-<%= issue_template.id %>');"></a>
+                </td>
                 <td><%=h issue_template.tracker.name %></td>
                 <td><%=h issue_template.author %></td>
                 <td><%= format_time(issue_template.updated_on)%> </td>
                 <td class="center"><%= checked_image issue_template.is_default? %></td>
                 <td class="center"><%= checked_image issue_template.enabled? %></td>
               </tr>
+              <tr class="<%= current_cycle %>" style="display: none;" id="template_description-<%= issue_template.id %>">
+                <td class="description" colspan="8">
+                  <div class="wiki"><%= textilizable(issue_template.description) %></div></td>
+              </tr>
           <% end %>
           </tbody>
         </table>
@@ -151,13 +167,19 @@
 
               <td>
                 <%= link_to h(issue_template.title),  {:controller => 'global_issue_templates',
-                    :id => issue_template.id, :action => 'show'},
-                    title: textilizable(issue_template.description), class: "template_tooltip" %>
+                                                       :id => issue_template.id, :action => 'show'},
+                            title: "#{html_escape(issue_template.note)}" %>
+                <a class="icon template_tooltip" href="#" title="<%= l(:label_preview) %>"
+                   onclick="checkExpand('global_template_description-<%= issue_template.id %>');"></a>
               </td>
               <td><%=h issue_template.tracker.name %></td>
               <td><%=h issue_template.author %></td>
               <td><%= format_time(issue_template.updated_on)%> </td>
             </tr>
+            <tr class="<%= current_cycle %>" style="display: none;" id="global_template_description-<%= issue_template.id %>">
+              <td class="description" colspan="8">
+                <div class="wiki"><%= textilizable(issue_template.description) %></div></td>
+            </tr>
         <% end %>
         </tbody>
       </table>
diff --git a/assets/javascripts/issue_templates.js b/assets/javascripts/issue_templates.js
index c77685a..3a4359d 100644
--- a/assets/javascripts/issue_templates.js
+++ b/assets/javascripts/issue_templates.js
@@ -4,19 +4,6 @@
  */
 changeType = "";
 
-$(function () {
-    $(".template_tooltip").tooltip({
-        position: {
-            my: "left top",
-            at: "right bottom"
-        },
-        content: function () {
-            return $(this).prop('title');
-
-        }
-    });
-});
-
 function checkExpand(ch) {
     var obj=document.all && document.all(ch) || document.getElementById && document.getElementById(ch);
     if(obj && obj.style) obj.style.display=