diff --git a/awx/ui/client/lib/components/input/secret.partial.html b/awx/ui/client/lib/components/input/secret.partial.html
index b4c1012862..dc3e850552 100644
--- a/awx/ui/client/lib/components/input/secret.partial.html
+++ b/awx/ui/client/lib/components/input/secret.partial.html
@@ -11,7 +11,11 @@
                     <i class="fa fa-search"></i>
                 </button>
             </span>
-            <span ng-if="state.tagMode && state.asTag" class="form-control at-Input">
+            <span
+              ng-if="state.tagMode && state.asTag"
+              ng-disabled="state._disabled || form.disabled"
+              class="form-control at-Input"
+            >
               <div class="at-InputTagContainer">
                 <at-tag
                   ng-show="(!state._disabled) && state._tagValue"
diff --git a/awx/ui/client/lib/components/input/text.partial.html b/awx/ui/client/lib/components/input/text.partial.html
index 3febbbedf7..63fc73ec6a 100644
--- a/awx/ui/client/lib/components/input/text.partial.html
+++ b/awx/ui/client/lib/components/input/text.partial.html
@@ -10,7 +10,11 @@
                   <i class="fa fa-search"></i>
               </button>
           </span>
-          <span ng-if="state.asTag" class="form-control at-Input">
+          <span
+            ng-if="state.asTag"
+            ng-disabled="state._disabled || form.disabled"
+            class="form-control at-Input"
+          >
             <div class="at-InputTagContainer">
               <at-tag
                 ng-show="(!state._disabled) && state._tagValue"
diff --git a/awx/ui/client/lib/components/input/textarea-secret.partial.html b/awx/ui/client/lib/components/input/textarea-secret.partial.html
index 4a5ea22af4..61f3f376c3 100644
--- a/awx/ui/client/lib/components/input/textarea-secret.partial.html
+++ b/awx/ui/client/lib/components/input/textarea-secret.partial.html
@@ -21,6 +21,7 @@
             />
             <div
               ng-show="state.asTag"
+              ng-disabled="state._disabled || form.disabled"
               class="form-control at-Input at-InputTaggedTextarea"
               >
               <div class="at-InputTagContainer">
diff --git a/awx/ui/client/lib/components/input/textarea.partial.html b/awx/ui/client/lib/components/input/textarea.partial.html
index d70d696aad..044d2c119f 100644
--- a/awx/ui/client/lib/components/input/textarea.partial.html
+++ b/awx/ui/client/lib/components/input/textarea.partial.html
@@ -11,6 +11,7 @@
           </div>
           <div
             ng-show="state.asTag"
+            ng-disabled="state._disabled || form.disabled"
             class="form-control at-Input at-InputTaggedTextarea"
             >
               <div class="at-InputTagContainer">