diff --git a/src/scripts/lib/clay-config.js b/src/scripts/lib/clay-config.js
index 0a31610..45559ea 100644
--- a/src/scripts/lib/clay-config.js
+++ b/src/scripts/lib/clay-config.js
@@ -189,7 +189,7 @@ function ClayConfig(settings, config, $rootContainer, meta) {
   self.getItemsByGroup = function(group) {
     _checkBuilt('getItemsByGroup');
     return _items.filter(function(item) {
-      return item.config.group === group;
+      return item.config.groups && item.config.groups.indexOf(group) > -1;
     });
   };
 
diff --git a/test/spec/lib/clay-config.js b/test/spec/lib/clay-config.js
index abffc45..e6bd2f2 100644
--- a/test/spec/lib/clay-config.js
+++ b/test/spec/lib/clay-config.js
@@ -292,9 +292,9 @@ describe('ClayConfig', function() {
   describe('.getItemsByGroup()', function() {
     it('it returns the correct items', function() {
       var config = fixtures.config([
-        {type: 'input', id: 'g1-0', group: 'group1'},
-        {type: 'text', id: 'g2-0', group: 'group2'},
-        {type: 'input', id: 'g1-1', group: 'group1'}
+        {type: 'input', id: 'g1-0', groups: ['group1']},
+        {type: 'text', id: 'g2-0', groups: ['group2']},
+        {type: 'input', id: 'g1-1', groups: ['group1']}
       ]);
 
       var clayConfig = fixtures.clayConfig(config);