diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 32cb386c8..b3049b58a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,7 +1,7 @@
 module ApplicationHelper
 
   def tags(debate)
-    debate.tag_list.map { |tag| link_to sanitize(tag), debates_path(tag: tag) }.join(', ').html_safe
+    debate.tag_list.sort.map { |tag| link_to sanitize(tag), debates_path(tag: tag) }.join(', ').html_safe
   end
 
   def percentage(vote, debate)
diff --git a/spec/features/tags_spec.rb b/spec/features/tags_spec.rb
index 61376480d..5df827f52 100644
--- a/spec/features/tags_spec.rb
+++ b/spec/features/tags_spec.rb
@@ -34,7 +34,7 @@ feature 'Tags' do
 
     visit debate_path(debate)
 
-    expect(page).to have_content "Temas: Hacienda, Economía"
+    expect(page).to have_content "Temas: Economía, Hacienda"
   end
 
   scenario 'Tag Cloud' do
@@ -61,16 +61,16 @@ feature 'Tags' do
     check 'debate_terms_of_service'
 
     fill_in 'debate_tag_list', with: "Impuestos, Economía, Hacienda"
-    
+
     click_button 'Crear Debate'
 
     expect(page).to have_content 'Debate creado correctamente'
-    expect(page).to have_content 'Temas: Impuestos, Economía, Hacienda'
+    expect(page).to have_content 'Temas: Economía, Hacienda, Impuestos'
   end
 
   scenario 'Update' do
     debate = create(:debate, tag_list: 'Economía')
-    
+
     login_as(debate.author)
     visit edit_debate_path(debate)
 
@@ -88,12 +88,12 @@ feature 'Tags' do
 
     login_as(debate.author)
     visit edit_debate_path(debate)
-    
+
     fill_in 'debate_tag_list', with: ""
     click_button 'Actualizar Debate'
 
     expect(page).to have_content 'Debate actualizado correctamente'
     expect(page).to_not have_content 'Temas:'
   end
-  
+
 end
\ No newline at end of file