diff --git a/src/Module/Hashtag.php b/src/Module/Hashtag.php
index 82cfa1f84..c35a6440c 100644
--- a/src/Module/Hashtag.php
+++ b/src/Module/Hashtag.php
@@ -31,7 +31,7 @@ class Hashtag extends BaseModule
 			intval(TERM_HASHTAG)
 		);
 		while ($tag = dba::fetch($taglist)) {
-			$result[] = ['text' => strtolower($tag['term'])];
+			$result[] = ['text' => $tag['term']];
 		}
 		dba::close($taglist);
 
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index eb9d5efbe..885c38d6d 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -220,7 +220,15 @@ function string2bb(element) {
 		tags = {
 			match: /(^|\s)(\#)([^ \n]{2,})$/,
 			index: 3,
-			search: function(term, callback) { $.getJSON(baseurl + '/hashtag/' + '?f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); },
+			search: function(term, callback) {
+				$.getJSON(baseurl + '/hashtag/' + '?f=&t=' + term)
+				.done(function(data) {
+					callback($.map(data, function(entry) {
+						// .toLowerCase() enables case-insensitive search
+						return entry.text.toLowerCase().indexOf(term.toLowerCase()) === 0 ? entry : null;
+					}));
+				});
+			},
 			replace: function(item) { return "$1$2" + item.text + ' '; },
 			template: tag_format
 		};