diff --git a/web/components/dropdowns/module/index.tsx b/web/components/dropdowns/module/index.tsx
index 89e6a8217..5b7df2f23 100644
--- a/web/components/dropdowns/module/index.tsx
+++ b/web/components/dropdowns/module/index.tsx
@@ -73,7 +73,7 @@ const ButtonContent: React.FC<ButtonContentProps> = (props) => {
     return (
       <>
         {showCount ? (
-          <div className="relative flex items-center gap-1">
+          <div className="relative flex items-center gap-1 max-w-full">
             {!hideIcon && <DiceIcon className="h-3 w-3 flex-shrink-0" />}
             <div className="max-w-40 flex-grow truncate">
               {value.length > 0
diff --git a/web/components/issues/issue-layouts/properties/all-properties.tsx b/web/components/issues/issue-layouts/properties/all-properties.tsx
index 190d4a3fc..e62fbd54e 100644
--- a/web/components/issues/issue-layouts/properties/all-properties.tsx
+++ b/web/components/issues/issue-layouts/properties/all-properties.tsx
@@ -257,8 +257,9 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
       {/* basic properties */}
       {/* state */}
       <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="state">
-        <div className="h-5 truncate">
+        <div className="h-5">
           <StateDropdown
+            buttonContainerClassName="truncate max-w-40"
             value={issue.state_id}
             onChange={handleState}
             projectId={issue.project_id}
@@ -348,6 +349,7 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
       <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="modules">
         <div className="h-5">
           <ModuleDropdown
+            buttonContainerClassName="truncate max-w-40"
             projectId={issue?.project_id}
             value={issue?.module_ids ?? []}
             onChange={handleModule}
@@ -362,8 +364,9 @@ export const IssueProperties: React.FC<IIssueProperties> = observer((props) => {
 
       {/* cycles */}
       <WithDisplayPropertiesHOC displayProperties={displayProperties} displayPropertyKey="cycle">
-        <div className="h-5 truncate">
+        <div className="h-5">
           <CycleDropdown
+            buttonContainerClassName="truncate max-w-40"
             projectId={issue?.project_id}
             value={issue?.cycle_id}
             onChange={handleCycle}