diff --git a/modules/Vtiger/views/Basic.php b/modules/Vtiger/views/Basic.php
index 9625ee4641763043c665fefa85a3a9700f0fd055..f373715595a2795674ab36040934f5736bf06453 100644
--- a/modules/Vtiger/views/Basic.php
+++ b/modules/Vtiger/views/Basic.php
@@ -51,11 +51,12 @@ abstract class Vtiger_Basic_View extends Vtiger_Footer_View {
 		$supportGroup = $menuGroupedByParent['SUPPORT'];
 		unset($menuGroupedByParent['SUPPORT']);
 		$menuGroupedByParent['SUPPORT'] = $supportGroup;
+        $parentApp = $request->get('app');
 
 		foreach ($menuGroupedByParent as $parentCategory => $menuList) {
 			if($parentCategory == 'ANALYTICS' || $parentCategory == 'SETTINGS') continue;
 			if(count($menuList) > 0) {
-				if(array_key_exists($selectedModule, $menuList) && $parentCategory) {
+				if(array_key_exists($selectedModule, $menuList) && ($parentCategory == $parentApp)) {
 					$moduleFound = true;
 					$selectedModuleMenuCategory = $parentCategory;
 				}