diff --git a/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx b/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx
index 19380c6044..b6ab0d98fb 100644
--- a/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx
+++ b/packages/admin-next/dashboard/src/routes/products/common/variant-pricing-form.tsx
@@ -78,7 +78,9 @@ export const useVariantPriceGridColumns = ({
           return (
             <ReadonlyCell>
               <div className="flex h-full w-full items-center gap-x-2 overflow-hidden">
-                <span className="truncate">{entity.title}</span>
+                <span title={entity.title} className="truncate">
+                  {entity.title}
+                </span>
               </div>
             </ReadonlyCell>
           )
diff --git a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
index b4ebb6d65f..530fb5732b 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rule-value-form-field/rule-value-form-field.tsx
@@ -84,6 +84,7 @@ export const RuleValueFormField = ({
                   className="bg-ui-bg-base"
                   ref={valuesRef}
                   min={1}
+                  disabled={!fieldRule.attribute}
                 />
               </Form.Control>
               <Form.ErrorMessage />
@@ -97,6 +98,7 @@ export const RuleValueFormField = ({
                   {...field}
                   onChange={onChange}
                   className="bg-ui-bg-base"
+                  disabled={!fieldRule.attribute}
                 />
               </Form.Control>
               <Form.ErrorMessage />
@@ -112,6 +114,7 @@ export const RuleValueFormField = ({
                     Array.isArray(field.value) ? field.value[0] : field.value
                   }
                   onValueChange={onChange}
+                  disabled={!fieldRule.attribute}
                 >
                   <Select.Trigger ref={ref} className="bg-ui-bg-base">
                     <Select.Value placeholder="Select Value" />
@@ -144,6 +147,7 @@ export const RuleValueFormField = ({
                   options={options}
                   onChange={onChange}
                   className="bg-ui-bg-base"
+                  disabled={!fieldRule.attribute}
                 />
               </Form.Control>
 
diff --git a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx
index 4d34b82c5c..24fdacdaf1 100644
--- a/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx
+++ b/packages/admin-next/dashboard/src/routes/promotions/common/edit-rules/components/rules-form-field/rules-form-field.tsx
@@ -213,7 +213,11 @@ export const RulesFormField = ({
                       return (
                         <Form.Item className="basis-1/2">
                           <Form.Control>
-                            <Select {...field} onValueChange={onChange}>
+                            <Select
+                              {...field}
+                              disabled={!fieldRule.attribute}
+                              onValueChange={onChange}
+                            >
                               <Select.Trigger
                                 ref={operatorRef}
                                 className="bg-ui-bg-base"