diff --git a/module/group/model.php b/module/group/model.php
index 251194a89e..b0300104cd 100644
--- a/module/group/model.php
+++ b/module/group/model.php
@@ -1580,12 +1580,12 @@ class groupModel extends model
             ->andWhere('((t3.type')->eq('package')
             ->andWhere('t4.type')->eq('module')
             ->beginIF(!empty($view) and $view != 'general')->andWhere('t4.code')->in($modules)->fi()
-            ->beginIF(!empty($view) and $view == 'general')->andWhere('t4.code')->notin($modules)->fi()
+            ->beginIF(!empty($view) and $view == 'general')->andWhere('t4.parent')->eq('0')->fi()
             ->markRight(1)
             ->orWhere('(t3.type')->eq('module')
             ->andWhere('t4.type')->eq('view')
             ->beginIF(!empty($view) and $view != 'general')->andWhere('t3.code')->in($modules)->fi()
-            ->beginIF(!empty($view) and $view == 'general')->andWhere('t3.code')->notin($modules)->fi()
+            ->beginIF(!empty($view) and $view == 'general')->andWhere('t3.parent')->eq('0')->fi()
             ->markRight(2)
             ->orderBy("moduleOrder asc, t3.order asc, `order` asc")
             ->page($pager)