diff --git a/app/views/documents/new.html.erb b/app/views/documents/new.html.erb
index cf5c9fbab..d0463c104 100644
--- a/app/views/documents/new.html.erb
+++ b/app/views/documents/new.html.erb
@@ -1,7 +1,8 @@
-<div class="document-form <%= @document.documentable.class.name.parameterize('_') %> row">
+<div class="document-form <%= document_documentable_class(@document) %> row">
 
   <div class="small-12 medium-9 column">
-    <%= render "shared/back_link" %>
+    <%= back_link_to params[:from] %>
+
     <h1><%= t("documents.new.title") %></h1>
     <%= render "documents/form", form_url: documents_url %>
   </div>
@@ -15,4 +16,5 @@
       <li><%= t("documents.recommendation_three_html") %></li>
     </ul>
   </div>
+
 </div>
diff --git a/spec/features/proposals_spec.rb b/spec/features/proposals_spec.rb
index c1b5b1a37..9573a4639 100644
--- a/spec/features/proposals_spec.rb
+++ b/spec/features/proposals_spec.rb
@@ -1227,6 +1227,7 @@ feature 'Proposals' do
   end
 
   it_behaves_like "followable", "proposal", "proposal_path", { "id": "id" }
+
   it_behaves_like "documentable", "proposal", "proposal_path", { "id": "id" }
 
   scenario 'Erased author' do