diff --git a/app/views/dmsf/_path.html.erb b/app/views/dmsf/_path.html.erb
index 68c9d5a0..2019d776 100644
--- a/app/views/dmsf/_path.html.erb
+++ b/app/views/dmsf/_path.html.erb
@@ -28,7 +28,7 @@
       <% end %>
     <% end %>
   <% else %>
-     <%= l(:link_documents) %>
+     <%= link_to l(:link_documents), dmsf_path(:id => @project) %>
   <% end %>
   <% if filename %>
     /
diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index 8aac34da..6e537eb5 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -25,7 +25,8 @@
     :title => l(:title_copy)) if @folder.id %>
 </div>
 
-<%= render(:partial => 'path', :locals => {:folder => @pathfolder, :filename => @pathfolder == @parent ? l(:heading_new_folder) : nil}) %>  
+<% create = @pathfolder == @parent %>
+<%= render(:partial => 'path', :locals => {:folder => @pathfolder, :filename => create ? l(:heading_new_folder) : nil}) %>  
 
 <%= form_for(@folder, :url => {:action => create ? 'create' : 'save', :id => @project, :folder_id => @folder, :parent_id => @parent},
   :html => {:method=>:post}) do |f| %>
diff --git a/app/views/dmsf/email_entries.html.erb b/app/views/dmsf/email_entries.html.erb
index 64c95b76..522f2c13 100644
--- a/app/views/dmsf/email_entries.html.erb
+++ b/app/views/dmsf/email_entries.html.erb
@@ -22,7 +22,7 @@
 <div class="contextual">
 </div>
 
-<%= render(:partial => 'path', :locals => {:folder => @folder}) %>
+<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %>
 
 <h3><%= l(:heading_send_documents_by_email) %></h3>
 
diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index 81e0e3f9..e55d626a 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -65,7 +65,7 @@
   <% end %>
 </div>
 
-<%= render(:partial => 'path', :locals => {:folder => @folder}) %>
+<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %>
 
 <div class="dmsf-header">
   <div class="wiki">
diff --git a/app/views/dmsf_folders_copy/new.html.erb b/app/views/dmsf_folders_copy/new.html.erb
index 74f864e3..7ade03d2 100644
--- a/app/views/dmsf_folders_copy/new.html.erb
+++ b/app/views/dmsf_folders_copy/new.html.erb
@@ -21,7 +21,7 @@
 
 <div class="contextual"></div>
 
-<%= render(:partial => 'path', :locals => {:folder => @folder}) %>
+<%= render(:partial => 'path', :locals => {:folder => @folder, :filename => nil}) %>
 
 <% unless DmsfFolder.allowed_target_projects_on_copy.blank? %>
   <%= form_tag({:action => 'copy_to', :id => @folder}, :id => 'copyForm') do |f| %>
diff --git a/app/views/dmsf_upload/upload_files.html.erb b/app/views/dmsf_upload/upload_files.html.erb
index ef25b385..9513c916 100644
--- a/app/views/dmsf_upload/upload_files.html.erb
+++ b/app/views/dmsf_upload/upload_files.html.erb
@@ -22,7 +22,7 @@
 <div class="contextual">
 </div>
 
-<%= render(:partial => 'path', :locals => {:folder => @folder}) %>
+<%= render(:partial => '/dmsf/path', :locals => {:folder => @folder, :filename => nil}) %>
 
 <div class="wiki">
   <%= textilizable(@folder.description) if @folder %>