diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html
index d6ef1fe..4d6986c 100644
--- a/pagure/templates/pull_request.html
+++ b/pagure/templates/pull_request.html
@@ -390,34 +390,42 @@
               {%endmacro%}
 
               {% macro viewfilelink(filepath, identifier=False)%}
-                {% if pull_request %}
-                {% if not identifier %}
-                  {% set identifier = pull_request.branch_from %}
+                {% if pull_request and not pull_request.remote %}
+                    {% if not identifier %}
+                      {% set identifier = pull_request.branch_from %}
+                    {% endif %}
+                    <a href="{{
+                      url_for(
+                          'view_file',
+                          repo=pull_request.project_from.name,
+                          username=pull_request.project_from.user.username
+                              if pull_request.project_from.is_fork else None,
+                          namespace=pull_request.project_from.namespace,
+                          identifier=identifier,
+                          filename=filepath) }}"
+                      title="View file as of {{ patch_new_id|short }}">{{
+                      filepath | unicode }}</a>
+                {% elif not pull_request %}
+                    {% if identifier == False %}
+                      {% set identifier = branch_from %}
+                    {% endif %}
+                    <a href="{{
+                      url_for(
+                          'view_file',
+                          repo=repo.name,
+                          username=username,
+                          namespace=repo.namespace,
+                          identifier=identifier,
+                          filename=filepath) }}"
+                      title="View file as of {{ patch_new_id|short }}">{{
+                      filepath | unicode }}</a>
+                {% elif pull_request and pull_request.remote %}
+                  this is a remote pull-request, so we cannot provide you
+                  with a direct link to the file but you can always
+                  <a href="https://docs.pagure.org/pagure/usage/pull_requests.html#working-with-pull-requests">
+                    checkout the pull-request locally
+                  </a> to review it entirely.
                 {% endif %}
-                <a href="{{
-                  url_for(
-                      'view_file',
-                      repo=pull_request.project_from.name,
-                      username=pull_request.project_from.user.username
-                          if pull_request.project_from.is_fork else None,
-                      namespace=pull_request.project_from.namespace,
-                      identifier=identifier,
-                      filename=filepath) }}"
-                {% else %}
-                {% if identifier == False %}
-                  {% set identifier = branch_from %}
-                {% endif %}
-                <a href="{{
-                  url_for(
-                      'view_file',
-                      repo=repo.name,
-                      username=username,
-                      namespace=repo.namespace,
-                      identifier=identifier,
-                      filename=filepath) }}"
-                {% endif %}
-                title="View file as of {{ patch_new_id|short }}">{{
-                  filepath | unicode }}</a>
               {% endmacro %}
 
               {% if patch | hasattr('new_file_path') %}
@@ -877,11 +885,14 @@
             {%- endif -%}
           {%- elif patch | hasattr('delta') -%}
             {%- if patch.delta.new_file.path == patch.delta.old_file.path -%}
-              {%- if patch.delta.new_file.mode == 0 and patch.delta.old_file.mode == 33188 -%}
+              {%- if patch.delta.new_file.mode == 0
+                  and patch.delta.old_file.mode in [33188, 33261] -%}
                 {{ changesdeletedfile(patch.delta.new_file.path, linesadded, linesremoved, count) }}
-              {%-elif patch.delta.new_file.mode == 33188 and patch.delta.old_file.mode == 0 -%}
+              {%-elif patch.delta.new_file.mode in [33188, 33261]
+                   and patch.delta.old_file.mode == 0 -%}
                 {{ changesaddedfile(patch.delta.new_file.path, linesadded, linesremoved, count) }}
-              {%-elif patch.delta.new_file.mode == 33188 and patch.delta.old_file.mode == 33188 -%}
+              {%-elif patch.delta.new_file.mode in [33188, 33261]
+                   and patch.delta.old_file.mode in [33188, 33261] -%}
                 {{ changeschangedfile(patch.delta.new_file.path, linesadded, linesremoved, count) }}
               {%-endif-%}
             {%- else -%}