diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d7c45b4c0226eb417b745323c58943567c7f3b3..21b581785eaf2ffbe3ad42dcd4fa700680eefe1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Changed
+
+* `Content-Disposition` of plain text files now defaults to `inline`.
+
 ## [1.2.4] - March 5th, 2021
 
 ### Fixed
diff --git a/api/webserver/route_handler.go b/api/webserver/route_handler.go
index 3c3ec5486fd2eef0ed6e71cc0e25fa638eb7b3df..7f9b91470a77ced9f7a433de52d4c5ebff922d90 100644
--- a/api/webserver/route_handler.go
+++ b/api/webserver/route_handler.go
@@ -192,7 +192,7 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			if result.ContentType == "" {
 				disposition = "attachment"
 			} else {
-				if util.HasAnyPrefix(result.ContentType, []string{"image/", "audio/", "video/"}) {
+				if util.HasAnyPrefix(result.ContentType, []string{"image/", "audio/", "video/", "text/plain"}) {
 					disposition = "inline"
 				} else {
 					disposition = "attachment"