diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 7959ffe3b..fa9b38154 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -207,6 +207,10 @@ void cmFindBase::ExpandPaths()
       {
       this->FillCMakeEnvironmentPath();
       }
+    }
+  this->FillUserHintsPath();
+  if(!this->NoDefaultPath)
+    {
     if(!this->NoSystemEnvironmentPath)
       {
       this->FillSystemEnvironmentPath();
@@ -216,8 +220,6 @@ void cmFindBase::ExpandPaths()
       this->FillCMakeSystemVariablePath();
       }
     }
-
-  this->FillUserHintsPath();
   this->FillUserGuessPath();
 }
 
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 9b9071d8d..64176e7fb 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1133,6 +1133,10 @@ void cmFindPackageCommand::ComputePrefixes()
       {
       this->FillPrefixesCMakeEnvironment();
       }
+    }
+  this->FillPrefixesUserHints();
+  if(!this->NoDefaultPath)
+    {
     if(!this->NoSystemEnvironmentPath)
       {
       this->FillPrefixesSystemEnvironment();
@@ -1150,7 +1154,6 @@ void cmFindPackageCommand::ComputePrefixes()
       this->FillPrefixesSystemRegistry();
       }
     }
-  this->FillPrefixesUserHints();
   this->FillPrefixesUserGuess();
 
   this->ComputeFinalPaths();