diff --git a/disco/bot/bot.py b/disco/bot/bot.py
index b88d6f1..3388b90 100644
--- a/disco/bot/bot.py
+++ b/disco/bot/bot.py
@@ -303,10 +303,12 @@ class Bot(LoggingClass):
         if not self.command_matches_re or not self.command_matches_re.match(content):
             return
 
+        options = []
         for command in self.commands:
             match = command.compiled_regex.match(content)
             if match:
-                yield (command, match)
+                options.append((command, match))
+        return sorted(options, key=lambda obj: obj[0].group is None)
 
     def get_level(self, actor):
         level = CommandLevels.DEFAULT
@@ -359,14 +361,13 @@ class Bot(LoggingClass):
         if not len(commands):
             return False
 
-        result = False
         for command, match in commands:
             if not self.check_command_permissions(command, msg):
                 continue
 
             if command.plugin.execute(CommandEvent(command, msg, match)):
-                result = True
-        return result
+                return True
+        return False
 
     def on_message_create(self, event):
         if event.message.author.id == self.client.state.me.id:
diff --git a/tests/test_bot.py b/tests/test_bot.py
index fafc875..61149d5 100644
--- a/tests/test_bot.py
+++ b/tests/test_bot.py
@@ -69,3 +69,26 @@ class TestBot(TestCase):
         self.assertNotEqual(self.bot.command_matches_re.match('t b'), None)
         self.assertEqual(self.bot.command_matches_re.match('testing b'), None)
         self.assertEqual(self.bot.command_matches_re.match('testlmao a'), None)
+
+    def test_group_and_command(self):
+        plugin = Object()
+        plugin.bot = self.bot
+
+        self.bot._commands = [
+            Command(plugin, None, 'test'),
+            Command(plugin, None, 'a', group='test'),
+            Command(plugin, None, 'b', group='test'),
+        ]
+
+        self.bot.recompute()
+
+        msg = Object()
+
+        msg.content = '!test a'
+        commands = list(self.bot.get_commands_for_message(False, None, '!', msg))
+        self.assertEqual(commands[0][0], self.bot._commands[1])
+        self.assertEqual(commands[1][0], self.bot._commands[0])
+
+        msg.content = '!test'
+        commands = list(self.bot.get_commands_for_message(False, None, '!', msg))
+        self.assertEqual(commands[0][0], self.bot._commands[0])