diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb
index f1841a48603..4afb2e7005f 100644
--- a/app/controllers/uploads_controller.rb
+++ b/app/controllers/uploads_controller.rb
@@ -195,10 +195,10 @@ class UploadsController < ApplicationController
       content_type: MiniMime.lookup_by_filename(upload.original_filename)&.content_type
     }
 
-    if params[:inline]
-      opts[:disposition] = "inline"
-    elsif !FileHelper.is_supported_image?(upload.original_filename)
+    if !FileHelper.is_supported_image?(upload.original_filename)
       opts[:disposition] = "attachment"
+    elsif params[:inline]
+      opts[:disposition] = "inline"
     end
 
     file_path = Discourse.store.path_for(upload)
diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb
index 10b5003a85d..1c1d3b63eb9 100644
--- a/spec/requests/uploads_controller_spec.rb
+++ b/spec/requests/uploads_controller_spec.rb
@@ -296,6 +296,18 @@ describe UploadsController do
   end
 
   describe "#show_short" do
+    it 'inlines only supported image files' do
+      upload = upload_file("smallest.png")
+      get upload.short_path, params: { inline: true }
+      expect(response.header['Content-Type']).to eq('image/png')
+      expect(response.header['Content-Disposition']).to include('inline;')
+
+      upload.update!(original_filename: "test.xml")
+      get upload.short_path, params: { inline: true }
+      expect(response.header['Content-Type']).to eq('application/xml')
+      expect(response.header['Content-Disposition']).to include('attachment;')
+    end
+
     describe "local store" do
       fab!(:image_upload) { upload_file("smallest.png") }