diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb
index 68570dd70..1c5696304 100644
--- a/app/controllers/debates_controller.rb
+++ b/app/controllers/debates_controller.rb
@@ -1,13 +1,14 @@
 class DebatesController < ApplicationController
   before_action :parse_order, only: :index
   before_action :parse_tag_filter, only: :index
+  before_action :parse_search_terms, only: :index
   before_action :authenticate_user!, except: [:index, :show]
 
   load_and_authorize_resource
   respond_to :html, :js
 
   def index
-    @debates = Debate.all
+    @debates = @search_terms.present? ? Debate.search(@search_terms) : Debate.all
     @debates = @debates.tagged_with(@tag_filter) if @tag_filter
     @debates = @debates.page(params[:page]).for_render.send("sort_by_#{@order}")
     @tag_cloud = Debate.tag_counts.order(taggings_count: :desc, name: :asc).limit(20)
@@ -92,4 +93,8 @@ class DebatesController < ApplicationController
       end
     end
 
+    def parse_search_terms
+      @search_terms = params[:search] if params[:search].present?
+    end
+
 end
diff --git a/app/views/debates/index.html.erb b/app/views/debates/index.html.erb
index 2657857bf..e23a45f5c 100644
--- a/app/views/debates/index.html.erb
+++ b/app/views/debates/index.html.erb
@@ -3,18 +3,24 @@
   <div class="filters row">
     <div class="small-12 medium-9 column">
 
-      <% if @tag_filter %>
+      <% if @search_terms %>
         <div class="inline-block small-12 medium-8" >
-            <h2>
-              <%= t("debates.index.filter_topic",
-                     count: @debates.size,
-                     topic: @tag_filter) %>
+          <h2>
+            <%= page_entries_info @debates %>
+            <%= t("debates.index.search_results", count: @debates.size, search_term: @search_terms) %>
+            </h2>
+        </div>
+      <% elsif @tag_filter %>
+        <div class="inline-block small-12 medium-8" >
+          <h2>
+            <%= page_entries_info @debates %>
+            <%= t("debates.index.filter_topic", count: @debates.size, topic: @tag_filter) %>
             </h2>
         </div>
       <% end %>
 
-      <div class="inline-block <%= 'right' if @tag_filter %>">
-          <% if @tag_filter %>
+      <div class="inline-block <%= 'right' if (@tag_filter || @search_terms) %>">
+          <% if @tag_filter || @search_terms %>
             <h6 class="inline-block">
               <%= t("debates.index.select_order") %>
             </h6>
@@ -37,18 +43,6 @@
     </div>
   </div>
 
-  <!-- Search results -->
-  <div class="filters row">
-    <div class="small-12 column">
-      <h2>
-      <%= t("debates.index.search_results",
-          number: "N",
-          search_term: "búsqueda").html_safe%>
-    </h2>
-    </div>
-  </div>
-  <!-- /. Search results -->
-
   <div class="row">
     <div id="debates" class="debates-list small-12 medium-9 column js-order-<%= @order.dasherize %>">
       <%= render @debates %>
diff --git a/app/views/shared/_search_form.html.erb b/app/views/shared/_search_form.html.erb
index 0e3af9a03..e6f7dda0e 100644
--- a/app/views/shared/_search_form.html.erb
+++ b/app/views/shared/_search_form.html.erb
@@ -3,15 +3,19 @@
   <h3><%= t("shared.search_form.search_title") %></h3>
   <br>
   <div class="row">
-    <div class="small-12 columns">
-      <div class="row collapse">
-        <div class="small-9 medium-12 large-9 columns">
-          <input type="text" placeholder="<%= t("shared.search_form.search_placeholder") %>">
-        </div>
-        <div class="small-3 medium-12 large-3 columns">
-          <a href="#" class="button warning postfix"><%= t("shared.search_form.search_button") %></a>
+    <%= form_tag debates_path, method: :get do %>
+      <div class="small-12 columns">
+        <div class="row collapse">
+
+          <div class="small-9 medium-12 large-9 columns">
+            <input type="text" name="search" placeholder="<%= t("shared.search_form.search_placeholder") %>">
+          </div>
+          <div class="small-3 medium-12 large-3 columns">
+            <input type="submit" class="button warning postfix" value="<%= t('shared.search_form.search_button') %>">
+          </div>
+
         </div>
       </div>
-    </div>
+    <% end %>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ce683310b..50bc610b1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -77,9 +77,11 @@ en:
         most_commented: most commented
         random: random
       filter_topic:
-        one: "You are seeing one debate with the topic '%{topic}'"
-        other: "You are seeing %{count} debates with the topic '%{topic}'"
-      search_results: "Showing %{number} debates containing '%{search_term}'"
+        one: " with the topic '%{topic}'"
+        other: " with the topic '%{topic}'"
+      search_results:
+        one: " containing '%{search_term}'"
+        other: " containing '%{search_term}'"
     debate:
       debate: Debate
       comments:
diff --git a/config/locales/es.yml b/config/locales/es.yml
index e6e8ab462..430a9a363 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -77,9 +77,11 @@ es:
         most_commented: "más comentados"
         random: "aleatorio"
       filter_topic:
-        one: "Estás viendo un debate con el tema ''%{topic}''"
-        other: "Estás viendo %{count} debates con el tema '%{topic}'"
-      search_results: "Mostrando %{number} debates que contienen '%{search_term}'"
+        one: " con el tema '%{topic}'"
+        other: " con el tema '%{topic}'"
+      search_results:
+        one: " que contiene '%{search_term}'"
+        other: " que contienen '%{search_term}'"
     debate:
       debate: Debate
       comments:
diff --git a/spec/features/debates_spec.rb b/spec/features/debates_spec.rb
index 5a51b96bf..86903960f 100644
--- a/spec/features/debates_spec.rb
+++ b/spec/features/debates_spec.rb
@@ -441,4 +441,23 @@ feature 'Debates' do
       expect(debates_first_time).to_not eq(debates_second_time)
     end
   end
+
+  scenario 'Debate index search' do
+    debate1 = create(:debate, title: "Show me what you got")
+    debate2 = create(:debate, title: "Get Schwifty")
+    debate3 = create(:debate, description: "Unity")
+    debate4 = create(:debate, description: "Schwifty in here")
+
+    visit debates_path
+    fill_in "search", with: "Schwifty"
+    click_button "Search"
+
+    within("#debates") do
+      expect(page).to have_css('.debate', count: 2)
+      expect(page).to have_content(debate2.title)
+      expect(page).to have_content(debate4.title)
+      expect(page).to_not have_content(debate1.title)
+      expect(page).to_not have_content(debate3.title)
+    end
+  end
 end