diff --git a/include/class.thread.php b/include/class.thread.php
index 9ab7958e775436837571fb33f0c8e50e7d8e8eff..65c4543f2888d465300ae51ecc5b37f8ad2335c8 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -602,7 +602,7 @@ Class ThreadEntry {
             if($attachment['size'])
                 $size=sprintf('<em>(%s)</em>', Format::file_size($attachment['size']));
 
-            $str.=sprintf('<a class="Icon file" href="%s?id=%d&h=%s" target="%s">%s</a>%s&nbsp;%s',
+            $str.=sprintf('<a class="Icon file no-pjax" href="%s?id=%d&h=%s" target="%s">%s</a>%s&nbsp;%s',
                     $file, $attachment['attach_id'], $hash, $target, Format::htmlchars($attachment['name']), $size, $separator);
         }
 
diff --git a/scp/js/ticket.js b/scp/js/ticket.js
index 221f6aaca927d600172d9d92157ccabd5bbc308f..b590e5c017adfffcdcd8360b55ce58c8c1aacbb1 100644
--- a/scp/js/ticket.js
+++ b/scp/js/ticket.js
@@ -437,7 +437,7 @@ showImagesInline = function(urls, thread_id) {
                     }
                 ).append($('<div class="caption">')
                     .append('<span class="filename">'+info.filename+'</span>')
-                    .append('<a href="'+info.download_url+'" class="action-button"><i class="icon-download-alt"></i> Download</a>')
+                    .append('<a href="'+info.download_url+'" class="action-button no-pjax"><i class="icon-download-alt"></i> Download</a>')
                 );
             e.data('wrapped', true);
         }