diff --git a/app/views/repositories/_navigation.html.erb b/app/views/repositories/_navigation.html.erb
index 0cbb94ae6..0bd6e33cf 100644
--- a/app/views/repositories/_navigation.html.erb
+++ b/app/views/repositories/_navigation.html.erb
@@ -2,7 +2,7 @@
   <%= javascript_include_tag 'repository_navigation' %>
 <% end %>
 
-<% if @entry && @repository.supports_cat? %>
+<% if @entry && !@entry.is_dir? && @repository.supports_cat? %>
   <% download_label = @entry.size ? "#{l :button_download} (#{number_to_human_size @entry.size})" : l(:button_download) %>
   <%= link_to(download_label,
               {:action => 'raw', :id => @project,
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 29d1a5521..c7cd7bce2 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -277,6 +277,8 @@ class RepositoriesGitControllerTest < Redmine::ControllerTest
       assert_response :success
       assert_select 'h2 a', :text => 'sources'
       assert_select 'table.entries tbody'
+      assert_select 'div.contextual > a.icon-download', false
+
     end
 
     def test_diff