diff --git a/app/src/main/java/exh/util/ViewExtensions.kt b/app/src/main/java/exh/util/ViewExtensions.kt
index 92a6e816a..6958040af 100644
--- a/app/src/main/java/exh/util/ViewExtensions.kt
+++ b/app/src/main/java/exh/util/ViewExtensions.kt
@@ -123,7 +123,11 @@ fun ChipGroup.setChipsExtended(items: List<String>?, onClick: (item: String) ->
             var search = item
             if (sourceId == EXH_SOURCE_ID || sourceId == EH_SOURCE_ID || sourceId == NHENTAI_SOURCE_ID || sourceId == HITOMI_SOURCE_ID) {
                 val parsed = parseTag(search)
-                search = wrapTag(parsed.first, parsed.second.substringBefore('|').trim())
+                if (sourceId == HITOMI_SOURCE_ID) {
+                    search = wrapTagHitomi(parsed.first, parsed.second.substringBefore('|').trim())
+                } else {
+                    search = wrapTag(parsed.first, parsed.second.substringBefore('|').trim())
+                }
             }
             setOnClickListener { onClick(search) }
             setOnLongClickListener {
@@ -143,3 +147,9 @@ private fun wrapTag(namespace: String, tag: String) = if (tag.contains(' ')) {
 } else {
     "$namespace:$tag$"
 }
+
+private fun wrapTagHitomi(namespace: String, tag: String) = if (tag.contains(' ')) {
+    "$namespace:$tag".replace("\\s".toRegex(), "_")
+} else {
+    "$namespace:$tag"
+}