diff --git a/awx/ui/static/js/helpers/related-search.js b/awx/ui/static/js/helpers/related-search.js
index 4592f3967d..557d21024c 100644
--- a/awx/ui/static/js/helpers/related-search.js
+++ b/awx/ui/static/js/helpers/related-search.js
@@ -30,6 +30,19 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities', 'RefreshRela
                     relatedSets = params.relatedSets,
                     form = params.form, f;
 
+
+
+                // add 'selected' class to the selected li element
+                function setSelectedItem(iterator, label) {
+                    $('#' + iterator + 'SearchDropdown' + ' li').each(function() {
+                        $(this).removeClass('selected');
+                        var link = $(this).find('a');
+                        if (label === link.text()) {
+                            $(this).addClass('selected');
+                        }
+                    });
+                }
+
                 // Set default values
                 function setDefaults(inIterator) {
                     var iterator, f, fld, set;
@@ -75,6 +88,8 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities', 'RefreshRela
                             if (form.related[set].fields[f].searchType && form.related[set].fields[f].searchType === 'gtzero') {
                                 scope[iterator + "InputHide"] = true;
                             }
+
+                            setSelectedItem(iterator, scope[iterator + 'SearchFieldLabel']);
                         }
                     }
                 }
@@ -119,6 +134,8 @@ angular.module('RelatedSearchHelper', ['RestServices', 'Utilities', 'RefreshRela
                         scope[iterator + 'SearchType'] = 'int';
                     }
 
+                    setSelectedItem(iterator, label);
+
                     scope.search(iterator);
 
                 };
diff --git a/awx/ui/static/js/helpers/search.js b/awx/ui/static/js/helpers/search.js
index 23ce6eede6..e3109d195c 100644
--- a/awx/ui/static/js/helpers/search.js
+++ b/awx/ui/static/js/helpers/search.js
@@ -36,6 +36,19 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
                 sort_order = params.sort_order || '',
                 widgets, i, modifier;
 
+
+            // add 'selected' class to the selected li element
+            function setSelectedItem(iterator, label, modifier) {
+                // add 'selected' class to the selected li element
+                $('#' + iterator + 'SearchDropdown' + modifier + ' li').each(function() {
+                    $(this).removeClass('selected');
+                    var link = $(this).find('a');
+                    if (label === link.text()) {
+                        $(this).addClass('selected');
+                    }
+                });
+            }
+
             function setDefaults(widget) {
                 // Set default values
                 var f, fld, fka, modifier;
@@ -130,6 +143,8 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
                         scope[iterator + 'InputHide' + modifier] = true;
                     }
                 }
+
+                setSelectedItem(iterator, scope[iterator + 'SearchFieldLabel' + modifier], modifier);
             }
 
             if (setWidgets) {
@@ -231,8 +246,9 @@ angular.module('SearchHelper', ['RestServices', 'Utilities', 'RefreshHelper'])
                     scope[iterator + 'ShowStartBtn' + modifier] = false;
                 }
 
-                scope.search(iterator);
+                setSelectedItem(iterator, label, modifier);
 
+                scope.search(iterator);
             };
 
             scope.resetSearch = function (iterator) {