diff --git a/awx/ui/client/src/activity-stream/activitystream.route.js b/awx/ui/client/src/activity-stream/activitystream.route.js
index cbd9341af8..5b99ce55bd 100644
--- a/awx/ui/client/src/activity-stream/activitystream.route.js
+++ b/awx/ui/client/src/activity-stream/activitystream.route.js
@@ -49,16 +49,6 @@ export default {
             function(list, qs, $stateParams, GetBasePath) {
                 let path = GetBasePath(list.basePath) || GetBasePath(list.name);
                 let stateParams = $stateParams[`${list.iterator}_search`];
-
-                if($stateParams.target === "inventory_script"){
-                    stateParams.or__object1__in = 'custom_inventory_script';
-                    stateParams.or__object2__in = 'custom_inventory_script';
-                    if(stateParams.inventory_script){
-                        stateParams.custom_inventory_script = stateParams.inventory_script;
-                        delete stateParams.inventory_script;
-                    }
-                }
-                
                 // Sending or__object1__in=null will result in an api error response so lets strip
                 // these out.  This should only be null when hitting the All Activity page.
                 if(stateParams.or__object1__in && stateParams.or__object1__in === null) {
diff --git a/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js b/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
index 59c2b82a3c..fb90dccafe 100644
--- a/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
+++ b/awx/ui/client/src/activity-stream/streamDropdownNav/stream-dropdown-nav.directive.js
@@ -24,7 +24,7 @@ export default ['templateUrl', 'i18n', function(templateUrl, i18n) {
                 {label: i18n._('Credentials'), value: 'credential'},
                 {label: i18n._('Hosts'), value: 'host'},
                 {label: i18n._('Inventories'), value: 'inventory'},
-                {label: i18n._('Inventory Scripts'), value: 'inventory_script'},
+                {label: i18n._('Inventory Scripts'), value: 'custom_inventory_script'},
                 {label: i18n._('Jobs'), value: 'job'},
                 {label: i18n._('Notification Templates'), value: 'notification_template'},
                 {label: i18n._('Organizations'), value: 'organization'},
diff --git a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
index a9e4e8bc4e..0bbe13ccd3 100644
--- a/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
+++ b/awx/ui/client/src/bread-crumb/bread-crumb.directive.js
@@ -61,6 +61,10 @@ export default
                                 if(streamConfig.activityStreamId) {
                                     stateGoParams.id = $state.params[streamConfig.activityStreamId];
                                 }
+                                if(stateGoParams.target === "custom_inventory_script"){
+                                    stateGoParams.activity_search[streamConfig.activityStreamTarget] = $state.params.inventory_script_id;
+                                    stateGoParams.id = $state.params.inventory_script_id;
+                                }
 
                             }
                             originalRoute = $state.current;
diff --git a/awx/ui/client/src/helpers/ActivityStream.js b/awx/ui/client/src/helpers/ActivityStream.js
index d0bb7d6fd9..02bd972eee 100644
--- a/awx/ui/client/src/helpers/ActivityStream.js
+++ b/awx/ui/client/src/helpers/ActivityStream.js
@@ -43,7 +43,7 @@ export default
                         case 'job':
                             rtnTitle = i18n._('JOBS');
                             break;
-                        case 'inventory_script':
+                        case 'custom_inventory_script':
                             rtnTitle = i18n._('INVENTORY SCRIPTS');
                             break;
                         case 'schedule':
diff --git a/awx/ui/client/src/helpers/ApiModel.js b/awx/ui/client/src/helpers/ApiModel.js
index a93c62d61c..20bed707f2 100644
--- a/awx/ui/client/src/helpers/ApiModel.js
+++ b/awx/ui/client/src/helpers/ApiModel.js
@@ -48,7 +48,7 @@ export default
                         case 'management_job':
                             basePathKey = 'management_jobs';
                             break;
-                        case 'inventory_script':
+                        case 'custom_inventory_script':
                             basePathKey = 'inventory_scripts';
                             break;
                         case 'workflow_job_template':
diff --git a/awx/ui/client/src/inventory-scripts/main.js b/awx/ui/client/src/inventory-scripts/main.js
index f9910640a2..ba1a3fa228 100644
--- a/awx/ui/client/src/inventory-scripts/main.js
+++ b/awx/ui/client/src/inventory-scripts/main.js
@@ -59,7 +59,7 @@ angular.module('inventoryScripts', [
                     },
                     data: {
                         activityStream: true,
-                        activityStreamTarget: 'inventory_script'
+                        activityStreamTarget: 'custom_inventory_script'
                     },
                     ncyBreadcrumb: {
                         parent: 'setup',