diff --git a/js/tenantlist.js b/js/tenantlist.js
index 8a9eb310b84f..a6f74b007eff 100644
--- a/js/tenantlist.js
+++ b/js/tenantlist.js
@@ -1,8 +1,11 @@
 $(document).ready(function () {
-    $(":input").prop("disabled", true);
+ 
     let searchParams = new URLSearchParams(window.location.search)
     if (searchParams.has('Tenantfilter')) {
         var TenantID = searchParams.get('Tenantfilter')
+    } else {
+        $(":input").prop("disabled", true);
+        $("#exampleDataList").prop("disabled", false);
     }
 
     var dataList = document.getElementById('datalistOptions');
@@ -16,7 +19,7 @@ $(document).ready(function () {
         },
         'success': function (data) {
             data.forEach(function (item) {
-                $(":input").prop("disabled", false);
+                $("#exampleDataList").prop("disabled", false);
                 var option = document.createElement('option');
 
                 option.value = item.displayName;
@@ -31,7 +34,7 @@ $(document).ready(function () {
         },
         'error': function (xhr, ajaxOptions, thrownError) {
             $("#exampleDataList").val('Could not load tenants: Failed to connect to API:' + thrownError);
-            $(":input").prop("disabled", false);
+            $("#exampleDataList").prop("disabled", false);
         }
 
     });