diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx
index ec9dfdc0a7..7396793084 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ArchiveButton.tsx
@@ -53,14 +53,16 @@ export const ArchiveButton: VFC<IArchiveButtonProps> = ({
         <>
             <PermissionHOC projectId={projectId} permission={DELETE_FEATURE}>
                 {({ hasAccess }) => (
-                    <Button
-                        disabled={!hasAccess || isDialogOpen}
-                        variant='outlined'
-                        size='small'
-                        onClick={() => setIsDialogOpen(true)}
-                    >
-                        Archive
-                    </Button>
+                    <span>
+                        <Button
+                            disabled={!hasAccess || isDialogOpen}
+                            variant='outlined'
+                            size='small'
+                            onClick={() => setIsDialogOpen(true)}
+                        >
+                            Archive
+                        </Button>
+                    </span>
                 )}
             </PermissionHOC>
             <FeatureArchiveDialog
diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ManageTags.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ManageTags.tsx
index d9ba55a875..3db4578dd7 100644
--- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ManageTags.tsx
+++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeaturesBatchActions/ManageTags.tsx
@@ -96,14 +96,16 @@ export const ManageTags: VFC<IManageTagsProps> = ({
         <>
             <PermissionHOC projectId={projectId} permission={UPDATE_FEATURE}>
                 {({ hasAccess }) => (
-                    <Button
-                        disabled={!hasAccess || isOpen}
-                        variant='outlined'
-                        size='small'
-                        onClick={() => setIsOpen(true)}
-                    >
-                        Tags
-                    </Button>
+                    <span>
+                        <Button
+                            disabled={!hasAccess || isOpen}
+                            variant='outlined'
+                            size='small'
+                            onClick={() => setIsOpen(true)}
+                        >
+                            Tags
+                        </Button>
+                    </span>
                 )}
             </PermissionHOC>
             <ManageBulkTagsDialog