diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 1fc7a82f..96025526 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -174,7 +174,6 @@ class ProjectsController < ApplicationController
 
   # Add a new document to @project
   def add_document
-    @categories = Enumeration::get_values('DCAT')
     @document = @project.documents.build(params[:document])    
     if request.post? and @document.save	
       # Save the attachments
diff --git a/app/views/common/_attachments_form.rhtml b/app/views/common/_attachments_form.rhtml
new file mode 100644
index 00000000..673f4a52
--- /dev/null
+++ b/app/views/common/_attachments_form.rhtml
@@ -0,0 +1,6 @@
+<p id="attachments_p">
+<label for="attachment_file"><%=l(:label_attachment)%>
+<%= image_to_function "add.png", "addFileField();return false" %></label>
+<%= file_field_tag 'attachments[]', :size => 30  %>
+<em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em>
+</p>
diff --git a/app/views/documents/_form.rhtml b/app/views/documents/_form.rhtml
index ee7c289f..d45e295b 100644
--- a/app/views/documents/_form.rhtml
+++ b/app/views/documents/_form.rhtml
@@ -2,9 +2,7 @@
 <div class="box">
 <!--[form:document]-->
 <p><label for="document_category_id"><%=l(:field_category)%></label>
-<select name="document[category_id]">
-<%= options_from_collection_for_select @categories, "id", "name", @document.category_id %>
-</select></p>
+<%= select('document', 'category_id', Enumeration.get_values('DCAT').collect {|c| [c.name, c.id]}) %></p>
 
 <p><label for="document_title"><%=l(:field_title)%> <span class="required">*</span></label>
 <%= text_field 'document', 'title', :size => 60 %></p>
diff --git a/app/views/projects/add_document.rhtml b/app/views/projects/add_document.rhtml
index dc3103a7..6c3fe2c7 100644
--- a/app/views/projects/add_document.rhtml
+++ b/app/views/projects/add_document.rhtml
@@ -4,9 +4,7 @@
 <%= render :partial => 'documents/form' %>
 
 <div class="box">
-<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
-<%= image_to_function "add.png", "addFileField();return false" %></label>
-<%= file_field_tag 'attachments[]', :size => 30  %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p>
+<%= render :partial => 'common/attachments_form'%>
 </div>
 
 <%= submit_tag l(:button_create) %>
diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml
index 9575405f..595b15fd 100644
--- a/app/views/projects/list_documents.rhtml
+++ b/app/views/projects/list_documents.rhtml
@@ -1,5 +1,20 @@
 <div class="contextual">
-<%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'icon icon-add' %>
+<%= link_to_if_authorized l(:label_document_new),
+                          {:controller => 'projects', :action => 'add_document', :id => @project},
+                          :class => 'icon icon-add',
+                          :onclick => 'Element.show("add-document"); return false;' %>
+</div>
+
+<div id="add-document" style="display:none;">
+<h2><%=l(:label_document_new)%></h2>
+<% form_tag({:action => 'add_document', :id => @project}, :class => "tabular", :multipart => true) do %>
+<%= render :partial => 'documents/form' %>
+<div class="box">
+<%= render :partial => 'common/attachments_form'%>
+</div>
+<%= submit_tag l(:button_create) %>
+<%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
+<% end %>
 </div>
 
 <h2><%=l(:label_document_plural)%></h2>