diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 6994eb294..2a3844540 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -131,6 +131,11 @@ class RepositoriesController < ApplicationController
 
   def entry
     entry_and_raw(false)
+    @raw_url = url_for(:action => 'raw',
+                       :id     => @project,
+                       :repository_id => @repository.identifier_param,
+                       :path   => @path,
+                       :rev    => @rev)
   end
 
   def entry_and_raw(is_raw)
diff --git a/app/views/repositories/entry.html.erb b/app/views/repositories/entry.html.erb
index 940bb2dc2..0e898be71 100644
--- a/app/views/repositories/entry.html.erb
+++ b/app/views/repositories/entry.html.erb
@@ -9,11 +9,7 @@
 <%= render :partial => 'link_to_functions' %>
 
 <% if Redmine::MimeType.is_type?('image', @path) %>
-  <%= render :partial => 'common/image', :locals => {:path => url_for(:action => 'raw',
-                                                                      :id     => @project,
-                                                                      :repository_id => @repository.identifier_param,
-                                                                      :path   => @path,
-                                                                      :rev    => @rev), :alt => @path} %>
+  <%= render :partial => 'common/image', :locals => {:path => @raw_url, :alt => @path} %>
 <% elsif @content %>
   <%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
 <% else %>
@@ -24,14 +20,11 @@
      end %>
   <%= render :partial => 'common/other',
              :locals => {
-               :path => (url_for(params.merge(:action => 'raw')) if @allow_download),
+               :path => (@raw_url if @repository.supports_cat?),
                :kind => kind,
                :download_link => @repository.supports_cat? ? link_to(
                  l(:label_no_preview_download),
-                 { :action => 'raw', :id => @project,
-                   :repository_id => @repository.identifier_param,
-                   :path => to_path_param(@path),
-                   :rev => @rev },
+                 @raw_url,
                 :class => 'icon icon-download') : nil } %>
 <% end %>