diff --git a/pagure/templates/patchfile.html b/pagure/templates/patchfile.html
index 44dea01..fd1079a 100644
--- a/pagure/templates/patchfile.html
+++ b/pagure/templates/patchfile.html
@@ -4,15 +4,26 @@
     repo.namespace + '/' if repo.namespace }}{{ repo.name }} {% endblock %}
 
 {% block repo %}
-<div class="card" id="patch-file">
-        <h1>{{ patchfile }}</h1>
-        <hr />
-        {% autoescape false %}
-        {{ diff|html_diff}}
-        {% endautoescape %}
+<ul class="nav nav-tabs nav-small" role="tablist" id="pr-tabs">
+  <li class="nav-item pull-xs-right">
+    <a class="nav-link" href="{{ request.base_url + '?raw=1' }}">
+      <span class="hidden-sm-down">View Raw</span>
+    </a>
+  </li>
+</ul>
+<div class="card-header">
+  <strong>{{ patchfile }}</strong>
 </div>
+<div class="card card-block">
+  {% autoescape false %}
+    {{ diff|html_diff }}
+  {% endautoescape %}
+</div>
+<p>
+  <a href="{{ request.base_url + '?raw=1' }}">View Raw</a>
+</p>
 {% endblock %}
 
 {% block jscripts %}
-    {{ super() }}
+  {{ super() }}
 {% endblock %}
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index af69637..8bca123 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -1226,6 +1226,9 @@ def view_issue_raw_file(
     """ Displays the raw content of a file of a commit for the specified
     ticket repo.
     """
+    raw = flask.request.args.get('raw')
+    raw = str(raw).lower() in ['1', 'true', 't']
+
     repo = flask.g.repo
 
     if not repo.settings.get('issue_tracker', True):
@@ -1255,7 +1258,8 @@ def view_issue_raw_file(
     if not data:
         flask.abort(404, 'No content found')
 
-    if (filename.endswith('.patch') or filename.endswith('.diff')) \
+    if not raw \
+            and (filename.endswith('.patch') or filename.endswith('.diff')) \
             and not is_binary_string(content.data):
         # We have a patch file attached to this issue, render the diff in html
         orig_filename = filename.partition('-')[2]