diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index bcec9c6edab32bbaf1913802b958c92e498dd0c3..7c289f43ddf34e2357363b58c786c14d82e847c3 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -2804,12 +2804,12 @@ bool enable_object_build()
 
 bool enable_object_select_in_pathfinding_linksets()
 {
-	return LLSelectMgr::getInstance()->selectGetNonCharacter();
+	return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() &&  LLSelectMgr::getInstance()->selectGetNonCharacter();
 }
 
 bool enable_object_select_in_pathfinding_characters()
 {
-	return LLSelectMgr::getInstance()->selectGetCharacter();
+	return LLPathfindingManager::getInstance()->isPathfindingEnabledForCurrentRegion() &&  LLSelectMgr::getInstance()->selectGetCharacter();
 }
 
 class LLSelfRemoveAllAttachments : public view_listener_t