diff --git a/app/controllers/issue_templates_controller.rb b/app/controllers/issue_templates_controller.rb
index 1e3766a..76e1ba8 100644
--- a/app/controllers/issue_templates_controller.rb
+++ b/app/controllers/issue_templates_controller.rb
@@ -41,7 +41,7 @@ class IssueTemplatesController < ApplicationController
       end
     end
 
-    @globalIssueTemplates = GlobalIssueTemplate.joins(:projects).where(["projects.id = ?", @project.id])
+    @globalIssueTemplates = GlobalIssueTemplate.joins(:projects).where(["projects.id = ?", @project.id]).order('position')
 
     render :layout => !request.xhr?
   end
@@ -140,7 +140,7 @@ class IssueTemplatesController < ApplicationController
     end
 
     @globalIssueTemplates = GlobalIssueTemplate.joins(:projects).where(["tracker_id = ? AND projects.id = ?",
-                                                                        @tracker.id, @project.id])
+                                                                        @tracker.id, @project.id]).order('position')
 
 
     if @globalIssueTemplates.any?
@@ -165,7 +165,7 @@ class IssueTemplatesController < ApplicationController
     @issue_template = IssueTemplate.find(params[:id]) if params[:id]
     render :partial => 'common/preview'
   end
-  
+
   # Reorder templates
   def move
     move_order(params[:to])
diff --git a/app/views/issue_templates/index.html.erb b/app/views/issue_templates/index.html.erb
index a2028a4..5530a57 100644
--- a/app/views/issue_templates/index.html.erb
+++ b/app/views/issue_templates/index.html.erb
@@ -9,6 +9,7 @@
     {:controller => 'issue_templates', :action => 'new', :project_id => @project}, 
     :class => 'icon icon-add') %>
 </div>
+<div style="clear:both;"></div>
 
 <% if @notice -%>
   <div class="flash notice"><%= @notice -%></div>