diff --git a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx
index e34989a9f..83396023d 100644
--- a/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx
+++ b/packages/pl-fe/src/features/compose/components/polls/poll-form.tsx
@@ -78,7 +78,7 @@ const Option: React.FC<IOption> = ({
   };
 
   return (
-    <HStack alignItems='center' justifyContent='between' space={4}>
+    <div className='⁂-compose-form__poll__option'>
       <HStack alignItems='center' space={2} grow>
         <div className='w-6'>
           <Text weight='bold'>{index + 1}.</Text>
@@ -107,7 +107,7 @@ const Option: React.FC<IOption> = ({
           </Button>
         </div>
       )}
-    </HStack>
+    </div>
   );
 };
 
@@ -145,8 +145,8 @@ const PollForm: React.FC<IPollForm> = ({ composeId }) => {
   }
 
   return (
-    <Stack space={4}>
-      <Stack space={2}>
+    <div className='⁂-compose-form__poll'>
+      <div className='⁂-compose-form__poll__options'>
         {options.map((title: string, i: number) => (
           <Option
             composeId={composeId}
@@ -175,7 +175,7 @@ const PollForm: React.FC<IPollForm> = ({ composeId }) => {
             </Button>
           )}
         </HStack>
-      </Stack>
+      </div>
 
       <Divider />
 
@@ -212,7 +212,7 @@ const PollForm: React.FC<IPollForm> = ({ composeId }) => {
           {intl.formatMessage(messages.removePoll)}
         </button>
       </div>
-    </Stack>
+    </div>
   );
 };
 
diff --git a/packages/pl-fe/src/styles/new/compose.scss b/packages/pl-fe/src/styles/new/compose.scss
index 360500a26..392acac22 100644
--- a/packages/pl-fe/src/styles/new/compose.scss
+++ b/packages/pl-fe/src/styles/new/compose.scss
@@ -67,6 +67,18 @@
     }
   }
 
+  &__poll {
+    @apply flex flex-col gap-y-4;
+
+    &__options {
+      @apply flex flex-col gap-2;
+    }
+
+    &__option {
+      @apply flex items-center justify-between gap-4;
+    }
+  }
+
   &__schedule {
     @apply flex flex-col gap-2;