diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb
index eec74832d0..2dce155f13 100644
--- a/app/controllers/questions_controller.rb
+++ b/app/controllers/questions_controller.rb
@@ -48,13 +48,12 @@ def index_shadow
 
   # a form for new questions, at /questions/new
   def new
-    @node = Node.new
-    @revision = Revision.new
     # use another node body as a template
     node_id = params[:n].to_i
     if node_id && !params[:body] && Node.exists?(node_id)
-      node = Node.find(node_id)
-      params[:body] = node.body
+      @node = Node.find(node_id)
+      @revision = @node.revision.first
+      params[:body] = @node.body
     end
     if current_user.nil?
       redirect_to new_user_session_path(return_to: request.path)
diff --git a/app/views/editor/question.html.erb b/app/views/editor/question.html.erb
index 589939da49..73a3e4cde0 100644
--- a/app/views/editor/question.html.erb
+++ b/app/views/editor/question.html.erb
@@ -64,15 +64,14 @@
   %>
   <div class="card bg-light">
     <div class="card-body">
-     <% if params[:id] %>
-      <%= form_for :node, :as => :drupal_node, :url => url do |f| %>
-        <% if f.error_messages != "" %><div class="alert alert-danger"><%= f.error_messages :header_message => "Your note couldn't be saved." %></div><% end %>
+      <%= form_for :node, :as => :drupal_node, :url => url if params[:id] do |f| %>
+        <%= render partial: 'layouts/errorMessages', locals: { model: @node } %>
+
       <% end %>
 
       <%= form_for :revision, :as => :revision, :url => url, :html => {:class => "form well legacy-form row"} do |f| %>
 
-        <% if f.error_messages != "" %><div class="alert alert-danger"><%= f.error_messages :header_message => "Your note couldn't be saved." %></div><% end %>
-     <% end %>
+        <%= render partial: 'layouts/errorMessages', locals: { model: @revision } if @revision.present? %>
         <%= render :partial => "editor/main_image" %>
 
         <div class="col-lg-9 order-md-1">
@@ -120,8 +119,8 @@
           <p class="col-md-12">By publishing, you agree to <a target="_blank" href="/licenses">open source your work</a> so that others may use it.</p>
           <br />
         </div>
+        <% end %>
 
-      <% end %>
     </div>
   </div>
 </div>