diff --git a/apps/app/components/project/settings/states.tsx b/apps/app/components/project/settings/states.tsx
index 188886028..f7a7e8968 100644
--- a/apps/app/components/project/settings/states.tsx
+++ b/apps/app/components/project/settings/states.tsx
@@ -76,8 +76,8 @@ const StatesSettings: React.FC<Props> = ({ projectId }) => {
                     state.id !== selectedState ? (
                       <div
                         key={state.id}
-                        className={`bg-gray-50 p-3 flex justify-between items-center gap-2 border-b ${
-                          Boolean(activeGroup !== key) ? "last:border-0" : ""
+                        className={`bg-gray-50 p-3 flex justify-between items-center gap-2 border-t ${
+                          Boolean(activeGroup !== key) ? "first:border-0" : ""
                         }`}
                       >
                         <div className="flex items-center gap-2">
@@ -99,7 +99,7 @@ const StatesSettings: React.FC<Props> = ({ projectId }) => {
                         </div>
                       </div>
                     ) : (
-                      <div className={`border-b last:border-b-0`} key={state.id}>
+                      <div className={`border-t first:border-t-0`} key={state.id}>
                         <CreateUpdateStateInline
                           projectId={projectId as string}
                           onClose={() => {
diff --git a/apps/app/pages/projects/[projectId]/settings.tsx b/apps/app/pages/projects/[projectId]/settings.tsx
index 64d290bf8..f48506fd7 100644
--- a/apps/app/pages/projects/[projectId]/settings.tsx
+++ b/apps/app/pages/projects/[projectId]/settings.tsx
@@ -176,7 +176,7 @@ const ProjectSettings: NextPage = () => {
           <Tab.Group>
             <Tab.List className="flex items-center gap-x-4 gap-y-2 flex-wrap mb-8">
               {["General", "Control", "Members", "States", "Labels"].map((tab, index) => (
-                <Tab key={index}>
+                <Tab key={index} as="div">
                   {({ selected }) => (
                     <Button theme="secondary" className={selected ? "border-theme" : ""}>
                       {tab}