diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php
index 79607c26e..c38ffcf21 100644
--- a/classes/mobile/Mobile.class.php
+++ b/classes/mobile/Mobile.class.php
@@ -52,9 +52,7 @@ class Mobile
 		{
 			return $this->ismobile;
 		}
-
-		$db_info = Context::getDBInfo();
-		if($db_info->use_mobile_view != "Y" || Context::get('full_browse') || $_COOKIE["FullBrowse"])
+		if(Mobile::isMobileEnabled() === false || Context::get('full_browse') || $_COOKIE["FullBrowse"])
 		{
 			return ($this->ismobile = false);
 		}
@@ -234,5 +232,10 @@ class Mobile
 		$oMobile->ismobile = $ismobile;
 	}
 
+	function isMobileEnabled()
+	{
+		$db_info = Context::getDBInfo();
+		return ($db_info->use_mobile_view === 'Y');
+	}
 }
 ?>
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 0505a6a35..67aa3c151 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -667,8 +667,8 @@ class ModuleHandler extends Handler
 				'dispEditorConfigPreview' => 1,
 				'dispLayoutPreviewWithModule' => 1
 		);
-		$db_info = Context::getDBInfo();
-		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_info->use_mobile_view == "Y")
+		$db_use_mobile = Mobile::isMobileEnabled();
+		if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent() && !isset($skipAct[Context::get('act')]) && $db_use_mobile === true)
 		{
 			global $lang;
 			$header = '<style>div.xe_mobile{opacity:0.7;margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0}p.xe_mobile{text-align:center;margin:1em 0}a.xe_mobile{color:#ff0;font-weight:bold;font-size:24px}@media only screen and (min-width:500px){a.xe_mobile{font-size:15px}}</style>';
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 960f0f584..c468d8cb7 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -606,8 +606,7 @@ class menuAdminController extends menu
 		$cmArgs->is_skin_fix = 'N';
 		$cmArgs->is_mskin_fix = 'N';
 
-		$db_info = Context::getDBInfo();
-		if($db_info->use_mobile_view == 'Y')
+		if(Mobile::isMobileEnabled() === true)
 		{
 			$cmArgs->use_mobile = 'Y';
 		}