diff --git a/lib/redmine/search.rb b/lib/redmine/search.rb
index bf8b7633a..3c1e0700c 100644
--- a/lib/redmine/search.rb
+++ b/lib/redmine/search.rb
@@ -135,7 +135,7 @@ module Redmine
       def tokens
         # extract tokens from the question
         # eg. hello "bye bye" => ["hello", "bye bye"]
-        tokens = @question.scan(%r{((\s|^)"[^"]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
+        tokens = @question.scan(%r{(([[:space:]]|^)"[^"]+"([[:space:]]|$)|[[:^space:]]+)}).collect {|m| m.first.gsub(%r{(^[[:space:]]*"[[:space:]]*|[[:space:]]*"[[:space:]]*$)}, '')}
         # tokens must be at least 2 characters long
         # but for Chinese characters (Chinese HANZI/Japanese KANJI), tokens can be one character
         # no more than 5 tokens to search for
diff --git a/test/unit/lib/redmine/search_test.rb b/test/unit/lib/redmine/search_test.rb
index e2944b4ac..82f455066 100644
--- a/test/unit/lib/redmine/search_test.rb
+++ b/test/unit/lib/redmine/search_test.rb
@@ -24,4 +24,9 @@ class Redmine::Search::Tokenize < ActiveSupport::TestCase
     value = "hello \"bye bye\""
     assert_equal ["hello", "bye bye"], Redmine::Search::Tokenizer.new(value).tokens
   end
+
+  def test_tokenize_should_consider_ideographic_space_as_separator
+    value = "全角　スペース"  # The space character is U+3000, not U+0020
+    assert_equal ["全角", "スペース"], Redmine::Search::Tokenizer.new(value).tokens
+  end
 end