diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
index 729753c3cc..ea5ae1cd22 100644
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.controller.js
@@ -71,9 +71,9 @@ export default ['$compile', '$scope', '$stateParams', '$state', 'Rest', 'UserLis
             var listMode = (mode === 'admins') ? 'users' : mode;
 
             list = getList(mode);
-            list.listTitle = listTitle;
-
             url = getUrl(mode, data);
+            list.listTitle = listTitle;
+            list.basePath = url;
 
             $scope.orgRelatedUrls = data.related;
 
diff --git a/awx/ui/client/src/search/getSearchHtml.service.js b/awx/ui/client/src/search/getSearchHtml.service.js
index f64e5a12bf..3ae5dbfe00 100644
--- a/awx/ui/client/src/search/getSearchHtml.service.js
+++ b/awx/ui/client/src/search/getSearchHtml.service.js
@@ -31,7 +31,11 @@ export default ['GetBasePath', function(GetBasePath) {
         if (endPoint === 'inventories') {
             endPoint = 'inventory';
         }
-        return GetBasePath(endPoint);
+        if (endPoint.indexOf("/api/v1") > -1) {
+            return endPoint;
+        } else {
+            return GetBasePath(endPoint);
+        }
     };
 
     // inject the directive with the list and endpoint