diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index a75b9e9b..337b850b 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -374,4 +374,11 @@ class DmsfFile < ActiveRecord::Base
     [results, results_count]
   end
   
+  def display_name
+    if self.name.length > 50
+      return "#{self.name[0, 25]}...#{self.name[-25, 25]}"
+    end
+    self.name
+  end
+  
 end
diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb
index fdd97fe3..ba4c8105 100644
--- a/app/models/dmsf_link.rb
+++ b/app/models/dmsf_link.rb
@@ -79,6 +79,9 @@ class DmsfLink < ActiveRecord::Base
       path = folder.dmsf_path_str if folder      
     end
     path.insert(0, "#{self.target_project.name}:") if self.project_id != self.target_project_id && path
+    if path.length > 50
+      return "#{path[0, 25]}...#{path[-25, 25]}"
+    end
     path
   end
    
diff --git a/app/views/dmsf/_file.html.erb b/app/views/dmsf/_file.html.erb
index bd00bfd5..cd875052 100644
--- a/app/views/dmsf/_file.html.erb
+++ b/app/views/dmsf/_file.html.erb
@@ -31,7 +31,7 @@
     :class => "icon icon-file #{DmsfHelper.filetype_css(file.name)}",
     :title => l(:title_title_version_version_download, :title => h(file.title), :version => file.version),
     'data-downloadurl' => "#{file.last_revision.detect_content_type}:#{h(file.name)}:#{file_download_url}") %>
-  <div class="filename" title="<%= l(:title_filename_for_download)%>"><%= h(link ? link.path : file.name) %></div>
+  <div class="filename" title="<%= l(:title_filename_for_download)%>"><%= h(link ? link.path : file.display_name) %></div>
 </td>
 <td class="size"><%= number_to_human_size(file.last_revision.size) %></td>
 <td class="modified">