diff --git a/app/models/theme.rb b/app/models/theme.rb
index 411edc8fed4..133466079f1 100644
--- a/app/models/theme.rb
+++ b/app/models/theme.rb
@@ -273,6 +273,7 @@ class Theme < ActiveRecord::Base
       fields = ThemeField.find_by_theme_ids(theme_ids)
         .where(target_id: [Theme.targets[target], Theme.targets[:common]])
         .where(name: name.to_s)
+        .order(:target_id)
     end
 
     fields.each(&:ensure_baked!)