diff --git a/src/General/Get.coffee b/src/General/Get.coffee
index 91b85f3e2..32ed5206b 100644
--- a/src/General/Get.coffee
+++ b/src/General/Get.coffee
@@ -1,7 +1,7 @@
 Get =
   threadExcerpt: (thread) ->
     {OP} = thread
-    excerpt = ("/#{thread.board}/ - ") + (
+    excerpt = ("/#{decodeURIComponent thread.board.ID}/ - ") + (
       OP.info.subject?.trim() or
       OP.commentDisplay().replace(/\n+/g, ' // ') or
       OP.file?.name or
diff --git a/src/main/Main.coffee b/src/main/Main.coffee
index 77216b6cd..1f820327a 100644
--- a/src/main/Main.coffee
+++ b/src/main/Main.coffee
@@ -323,6 +323,7 @@ Main =
 
       for threadRoot in $$(s.thread, board)
         boardObj = if (boardID = threadRoot.dataset.board)
+          boardID = encodeURIComponent boardID
           g.boards[boardID] or new Board(boardID)
         else
           g.BOARD