diff --git a/frontend/src/component/feedbackNew/FeedbackComponent.tsx b/frontend/src/component/feedbackNew/FeedbackComponent.tsx
index 96a6822501..9c49f2c0bd 100644
--- a/frontend/src/component/feedbackNew/FeedbackComponent.tsx
+++ b/frontend/src/component/feedbackNew/FeedbackComponent.tsx
@@ -22,6 +22,7 @@ import type { FeedbackData, FeedbackMode } from './FeedbackContext';
 import { usePlausibleTracker } from 'hooks/usePlausibleTracker';
 import { useUiFlag } from 'hooks/useUiFlag';
 import useUserType from './useUserType';
+import { BaseModal } from 'component/common/SidebarModal/SidebarModal';
 
 export const ParentContainer = styled('div')(({ theme }) => ({
     position: 'relative',
@@ -150,7 +151,7 @@ const StyledScoreValue = styled('label')(({ theme }) => ({
         background: theme.palette.primary.main,
         color: theme.palette.primary.contrastText,
     },
-    '& input:hover + span': {
+    '& input:is(:hover, :focus) + span': {
         outline: '2px solid',
         outlineOffset: 2,
         outlineColor: theme.palette.primary.main,
@@ -278,192 +279,184 @@ export const FeedbackComponent = ({
     };
 
     return (
-        <ConditionallyRender
-            condition={showFeedback}
-            show={
-                <ParentContainer>
-                    <ClickAwayListener onClickAway={() => closeFeedback()}>
-                        <StyledContainer>
-                            <Tooltip title='Close' arrow>
-                                <StyledCloseButton
-                                    onClick={closeFeedback}
-                                    size='large'
-                                >
-                                    <CloseIcon />
-                                </StyledCloseButton>
-                            </Tooltip>
-                            <StyledContent>
-                                <StyledTitle>
-                                    Help us improve Unleash
-                                </StyledTitle>
-                                <StyledForm onSubmit={onSubmission}>
-                                    <input
-                                        type='hidden'
-                                        name='category'
-                                        value={feedbackData.category}
-                                    />
-                                    <input
-                                        type='hidden'
-                                        name='userType'
-                                        value={userType}
-                                    />
-                                    <FormTitle>{feedbackData.title}</FormTitle>
-                                    <StyledScoreContainer>
-                                        <StyledScoreInput>
-                                            {[1, 2, 3, 4, 5, 6, 7].map(
-                                                (score) => (
-                                                    <StyledScoreValue
-                                                        key={score}
-                                                    >
-                                                        <input
-                                                            type='radio'
-                                                            name='difficultyScore'
-                                                            value={score}
-                                                            onChange={
-                                                                onScoreChange
-                                                            }
-                                                        />
-                                                        <span>{score}</span>
-                                                    </StyledScoreValue>
-                                                ),
-                                            )}
-                                        </StyledScoreInput>
-                                        <ScoreHelpContainer>
-                                            <StyledScoreHelp>
-                                                Very difficult
-                                            </StyledScoreHelp>
-                                            <StyledScoreHelp>
-                                                Very easy
-                                            </StyledScoreHelp>
-                                        </ScoreHelpContainer>
-                                    </StyledScoreContainer>
+        <BaseModal open={showFeedback} onClose={closeFeedback} label='Feedback'>
+            <ParentContainer>
+                <ClickAwayListener onClickAway={() => closeFeedback()}>
+                    <StyledContainer>
+                        <Tooltip title='Close' arrow>
+                            <StyledCloseButton
+                                onClick={closeFeedback}
+                                size='large'
+                            >
+                                <CloseIcon />
+                            </StyledCloseButton>
+                        </Tooltip>
+                        <StyledContent>
+                            <StyledTitle>Help us improve Unleash</StyledTitle>
+                            <StyledForm onSubmit={onSubmission}>
+                                <input
+                                    type='hidden'
+                                    name='category'
+                                    value={feedbackData.category}
+                                />
+                                <input
+                                    type='hidden'
+                                    name='userType'
+                                    value={userType}
+                                />
+                                <FormTitle>{feedbackData.title}</FormTitle>
+                                <StyledScoreContainer>
+                                    <StyledScoreInput>
+                                        {[1, 2, 3, 4, 5, 6, 7].map((score) => (
+                                            <StyledScoreValue key={score}>
+                                                <input
+                                                    type='radio'
+                                                    name='difficultyScore'
+                                                    value={score}
+                                                    onChange={onScoreChange}
+                                                />
+                                                <span>{score}</span>
+                                            </StyledScoreValue>
+                                        ))}
+                                    </StyledScoreInput>
+                                    <ScoreHelpContainer>
+                                        <StyledScoreHelp>
+                                            Very difficult
+                                        </StyledScoreHelp>
+                                        <StyledScoreHelp>
+                                            Very easy
+                                        </StyledScoreHelp>
+                                    </ScoreHelpContainer>
+                                </StyledScoreContainer>
 
-                                    {feedbackComments !== false &&
-                                    feedbackComments.enabled &&
-                                    feedbackComments.name ===
-                                        'withoutComments' ? (
-                                        <>
-                                            <Box>
-                                                <TextField
-                                                    placeholder='Your answer here'
-                                                    style={{ width: '100%' }}
-                                                    name='positive'
-                                                    hidden
-                                                    value={
-                                                        feedbackComments.name
-                                                    }
-                                                    multiline
-                                                    rows={3}
-                                                    variant='outlined'
-                                                    size='small'
-                                                    InputLabelProps={{
-                                                        style: {
-                                                            fontSize:
-                                                                theme.fontSizes
-                                                                    .smallBody,
-                                                        },
-                                                    }}
-                                                />
-                                            </Box>
-                                            <Box>
-                                                <TextField
-                                                    placeholder='Your answer here'
-                                                    style={{ width: '100%' }}
-                                                    multiline
-                                                    name='areasForImprovement'
-                                                    rows={3}
-                                                    InputLabelProps={{
-                                                        style: {
-                                                            fontSize:
-                                                                theme.fontSizes
-                                                                    .smallBody,
-                                                        },
-                                                    }}
-                                                    variant='outlined'
-                                                    size='small'
-                                                    hidden
-                                                />
-                                            </Box>
-                                        </>
-                                    ) : (
-                                        <>
-                                            <Box>
-                                                <FormSubTitle>
-                                                    {feedbackData.positiveLabel}
-                                                </FormSubTitle>
-                                                <TextField
-                                                    placeholder='Your answer here'
-                                                    style={{ width: '100%' }}
-                                                    name='positive'
-                                                    multiline
-                                                    rows={3}
-                                                    variant='outlined'
-                                                    size='small'
-                                                    InputLabelProps={{
-                                                        style: {
-                                                            fontSize:
-                                                                theme.fontSizes
-                                                                    .smallBody,
-                                                        },
-                                                    }}
-                                                />
-                                            </Box>
-                                            <Box>
-                                                <FormSubTitle>
-                                                    {
-                                                        feedbackData.areasForImprovementsLabel
-                                                    }
-                                                </FormSubTitle>
-                                                <TextField
-                                                    placeholder='Your answer here'
-                                                    style={{ width: '100%' }}
-                                                    multiline
-                                                    name='areasForImprovement'
-                                                    rows={3}
-                                                    InputLabelProps={{
-                                                        style: {
-                                                            fontSize:
-                                                                theme.fontSizes
-                                                                    .smallBody,
-                                                        },
-                                                    }}
-                                                    variant='outlined'
-                                                    size='small'
-                                                />
-                                            </Box>
-                                        </>
-                                    )}
+                                {feedbackComments !== false &&
+                                feedbackComments.enabled &&
+                                feedbackComments.name === 'withoutComments' ? (
+                                    <>
+                                        <Box>
+                                            <TextField
+                                                placeholder='Your answer here'
+                                                style={{
+                                                    width: '100%',
+                                                }}
+                                                name='positive'
+                                                hidden
+                                                value={feedbackComments.name}
+                                                multiline
+                                                rows={3}
+                                                variant='outlined'
+                                                size='small'
+                                                InputLabelProps={{
+                                                    style: {
+                                                        fontSize:
+                                                            theme.fontSizes
+                                                                .smallBody,
+                                                    },
+                                                }}
+                                            />
+                                        </Box>
+                                        <Box>
+                                            <TextField
+                                                placeholder='Your answer here'
+                                                style={{
+                                                    width: '100%',
+                                                }}
+                                                multiline
+                                                name='areasForImprovement'
+                                                rows={3}
+                                                InputLabelProps={{
+                                                    style: {
+                                                        fontSize:
+                                                            theme.fontSizes
+                                                                .smallBody,
+                                                    },
+                                                }}
+                                                variant='outlined'
+                                                size='small'
+                                                hidden
+                                            />
+                                        </Box>
+                                    </>
+                                ) : (
+                                    <>
+                                        <Box>
+                                            <FormSubTitle>
+                                                {feedbackData.positiveLabel}
+                                            </FormSubTitle>
+                                            <TextField
+                                                placeholder='Your answer here'
+                                                style={{
+                                                    width: '100%',
+                                                }}
+                                                name='positive'
+                                                multiline
+                                                rows={3}
+                                                variant='outlined'
+                                                size='small'
+                                                InputLabelProps={{
+                                                    style: {
+                                                        fontSize:
+                                                            theme.fontSizes
+                                                                .smallBody,
+                                                    },
+                                                }}
+                                            />
+                                        </Box>
+                                        <Box>
+                                            <FormSubTitle>
+                                                {
+                                                    feedbackData.areasForImprovementsLabel
+                                                }
+                                            </FormSubTitle>
+                                            <TextField
+                                                placeholder='Your answer here'
+                                                style={{
+                                                    width: '100%',
+                                                }}
+                                                multiline
+                                                name='areasForImprovement'
+                                                rows={3}
+                                                InputLabelProps={{
+                                                    style: {
+                                                        fontSize:
+                                                            theme.fontSizes
+                                                                .smallBody,
+                                                    },
+                                                }}
+                                                variant='outlined'
+                                                size='small'
+                                            />
+                                        </Box>
+                                    </>
+                                )}
 
-                                    <StyledButtonContainer>
-                                        <StyledButton
-                                            disabled={!selectedScore}
-                                            variant='contained'
-                                            color='primary'
-                                            type='submit'
-                                        >
-                                            Send Feedback
-                                        </StyledButton>
-                                        <ConditionallyRender
-                                            condition={
-                                                feedbackMode === 'manual'
-                                            }
-                                            show={
-                                                <StyledButton
-                                                    variant='outlined'
-                                                    color='primary'
-                                                    onClick={dontAskAgain}
-                                                >
-                                                    Don't ask me again
-                                                </StyledButton>
-                                            }
-                                        />
-                                    </StyledButtonContainer>
-                                </StyledForm>
-                            </StyledContent>
-                        </StyledContainer>
-                    </ClickAwayListener>
-                </ParentContainer>
-            }
-        />
+                                <StyledButtonContainer>
+                                    <StyledButton
+                                        disabled={!selectedScore}
+                                        variant='contained'
+                                        color='primary'
+                                        type='submit'
+                                    >
+                                        Send Feedback
+                                    </StyledButton>
+                                    <ConditionallyRender
+                                        condition={feedbackMode === 'manual'}
+                                        show={
+                                            <StyledButton
+                                                variant='outlined'
+                                                color='primary'
+                                                onClick={dontAskAgain}
+                                            >
+                                                Don't ask me again
+                                            </StyledButton>
+                                        }
+                                    />
+                                </StyledButtonContainer>
+                            </StyledForm>
+                        </StyledContent>
+                    </StyledContainer>
+                </ClickAwayListener>
+            </ParentContainer>
+        </BaseModal>
     );
 };