diff --git a/lib/i18n/i18n_interpolation_keys_finder.rb b/lib/i18n/i18n_interpolation_keys_finder.rb
index cc91e806b96..7c5fe9288a4 100644
--- a/lib/i18n/i18n_interpolation_keys_finder.rb
+++ b/lib/i18n/i18n_interpolation_keys_finder.rb
@@ -1,6 +1,6 @@
 class I18nInterpolationKeysFinder
   def self.find(text)
-    keys = text.scan(I18n::INTERPOLATION_PATTERN)
+    keys = text.scan(Regexp.union(I18n::INTERPOLATION_PATTERN, /\{\{(\w+)\}\}/))
     keys.flatten!
     keys.compact!
     keys.uniq!
diff --git a/spec/services/i18n_interpolation_keys_finder_spec.rb b/spec/services/i18n_interpolation_keys_finder_spec.rb
index dde36f40407..74407676526 100644
--- a/spec/services/i18n_interpolation_keys_finder_spec.rb
+++ b/spec/services/i18n_interpolation_keys_finder_spec.rb
@@ -4,8 +4,8 @@ require "i18n/i18n_interpolation_keys_finder"
 RSpec.describe I18nInterpolationKeysFinder do
   describe '#find' do
     it 'should return the right keys' do
-      expect(described_class.find('%{first} %{second}'))
-        .to eq(['first', 'second'])
+      expect(described_class.find('%{first} %{second} {{third}}'))
+        .to eq(['first', 'second', 'third'])
     end
   end
 end