diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index a887d83de..55645309f 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -363,10 +363,6 @@
     width: rem-calc(48);
   }
 
-  .edit-debate {
-    margin-bottom: 0;
-  }
-
   .debate-info,
   .proposal-info,
   .investment-project-info,
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index 44fa08a06..5f6d6b50f 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -9,13 +9,6 @@
       <div class="small-12 medium-9 column">
         <%= back_link_to %>
 
-        <% if current_user && @debate.editable_by?(current_user) %>
-          <%= link_to edit_debate_path(@debate), class: 'edit-debate button success small float-right' do %>
-            <span class="icon-edit"></span>
-            <%= t("debates.show.edit_debate_link") %>
-          <% end %>
-        <% end %>
-
         <h1><%= @debate.title %></h1>
         <% if @debate.conflictive? %>
           <div data-alert class="callout alert margin-top">
@@ -47,6 +40,15 @@
       </div>
 
       <aside class="small-12 medium-3 column">
+        <% if current_user && @debate.editable_by?(current_user) %>
+          <div class="sidebar-divider"></div>
+          <h2><%= t("debates.show.author") %></h2>
+          <%= link_to edit_debate_path(@debate), class: 'button hollow expanded' do %>
+            <span class="icon-edit"></span>
+            <%= t("debates.show.edit_debate_link") %>
+          <% end %>
+        <% end %>
+
         <div class="sidebar-divider"></div>
         <h2><%= t("votes.supports") %></h2>
         <div id="<%= dom_id(@debate) %>_votes">
diff --git a/config/locales/en/general.yml b/config/locales/en/general.yml
index 85bfbe699..5bc7fe956 100644
--- a/config/locales/en/general.yml
+++ b/config/locales/en/general.yml
@@ -158,6 +158,7 @@ en:
       flag: This debate has been flagged as inappropriate by several users.
       login_to_comment: You must %{signin} or %{signup} to leave a comment.
       share: Share
+      author: Author
     update:
       form:
         submit_button: Save changes
diff --git a/config/locales/es/general.yml b/config/locales/es/general.yml
index a15952cc9..1c45fe54e 100644
--- a/config/locales/es/general.yml
+++ b/config/locales/es/general.yml
@@ -158,6 +158,7 @@ es:
       flag: Este debate ha sido marcado como inapropiado por varios usuarios.
       login_to_comment: Necesitas %{signin} o %{signup} para comentar.
       share: Compartir
+      author: Autor
     update:
       form:
         submit_button: Guardar cambios