diff --git a/web/core/components/dropdowns/state.tsx b/web/core/components/dropdowns/state.tsx
index 838813019..9af77dd7e 100644
--- a/web/core/components/dropdowns/state.tsx
+++ b/web/core/components/dropdowns/state.tsx
@@ -234,11 +234,11 @@ export const StateDropdown: React.FC<Props> = observer((props) => {
                 filteredOptions.length > 0 ? (
                   filteredOptions.map((option) => (
                     <StateOption
+                      {...props}
                       key={option.value}
                       option={option}
                       selectedValue={value}
                       className="flex w-full cursor-pointer select-none items-center justify-between gap-2 truncate rounded px-1 py-1.5"
-                      {...props}
                     />
                   ))
                 ) : (
diff --git a/web/core/components/inbox/modals/create-modal/issue-properties.tsx b/web/core/components/inbox/modals/create-modal/issue-properties.tsx
index c5bcc965a..e237503f4 100644
--- a/web/core/components/inbox/modals/create-modal/issue-properties.tsx
+++ b/web/core/components/inbox/modals/create-modal/issue-properties.tsx
@@ -61,6 +61,7 @@ export const InboxIssueProperties: FC<TInboxIssueProperties> = observer((props)
           projectId={projectId}
           buttonVariant="border-with-text"
           tabIndex={getIndex("state_id")}
+          isForWorkItemCreation={!data?.id}
         />
       </div>