diff --git a/aqt/groupman.py b/aqt/groupman.py
index 2d9e792c1..0a72432d0 100644
--- a/aqt/groupman.py
+++ b/aqt/groupman.py
@@ -16,8 +16,8 @@ COLNEW = 5
 GREY = "#777"
 
 class GroupManager(QDialog):
-    def __init__(self, mw):
-        QDialog.__init__(self, mw)
+    def __init__(self, mw, parent=None):
+        QDialog.__init__(self, parent or mw)
         self.mw = mw
         self.form = aqt.forms.groupman.Ui_Dialog()
         self.form.setupUi(self)
diff --git a/aqt/main.py b/aqt/main.py
index d4d93c265..e2fec00bd 100755
--- a/aqt/main.py
+++ b/aqt/main.py
@@ -644,9 +644,9 @@ Debug info:\n%s""") % traceback.format_exc(), help="DeckErrors")
     def onOverview(self):
         self.moveToState("overview")
 
-    def onGroups(self):
+    def onGroups(self, parent=None):
         from aqt.groupman import GroupManager
-        g = GroupManager(self)
+        g = GroupManager(self, parent)
 
     def onCardStats(self):
         self.cardStats.show()
diff --git a/aqt/stats.py b/aqt/stats.py
index 8b618a1d5..5afc56cce 100644
--- a/aqt/stats.py
+++ b/aqt/stats.py
@@ -82,6 +82,7 @@ class DeckStats(QDialog):
         c = self.connect
         s = SIGNAL("clicked()")
         c(f.groups, s, lambda: self.changeSel(True))
+        f.groups.setShortcut("g")
         c(f.all, s, lambda: self.changeSel(False))
         c(f.month, s, lambda: self.changePeriod(0))
         c(f.year, s, lambda: self.changePeriod(1))
@@ -115,6 +116,8 @@ class DeckStats(QDialog):
 
     def changeSel(self, sel):
         self.sel = sel
+        if sel:
+            self.mw.onGroups(self)
         self.refresh()
 
     def loadFin(self, b):