diff --git a/packages/common-theme/src/Provider/ThemeSwitcherContext.tsx b/packages/common-theme/src/Provider/ThemeSwitcherContext.tsx
index ffe8dc549a..aafb1d886c 100644
--- a/packages/common-theme/src/Provider/ThemeSwitcherContext.tsx
+++ b/packages/common-theme/src/Provider/ThemeSwitcherContext.tsx
@@ -10,6 +10,8 @@ import { useLocalStorage } from "@chainsafe/browser-storage-hooks"
 
 type ThemeSwitcherContext = {
   desktop: boolean
+  tablet: boolean
+  mobile: boolean
   themeKey: string
   availableThemes: string[]
   setTheme(themeName: string): void
@@ -26,6 +28,8 @@ type ThemeSwitcherProps = {
 const ThemeSwitcher = ({ children, themes, storageKey = "cs.themeKey" }: ThemeSwitcherProps) => {
   const breakpoints = createBreakpoints({})
   const desktop = useMediaQuery(breakpoints.up("md"))
+  const tablet = useMediaQuery(breakpoints.up("sm"))
+  const mobile = useMediaQuery(breakpoints.up("xs"))
   const { canUseLocalStorage, localStorageGet, localStorageSet } = useLocalStorage()
 
   // TODO: check min 1 theme
@@ -60,6 +64,8 @@ const ThemeSwitcher = ({ children, themes, storageKey = "cs.themeKey" }: ThemeSw
     <ThemeSwitcherContext.Provider
       value={{
         desktop: desktop,
+        tablet: tablet,
+        mobile: mobile,
         themeKey: current,
         availableThemes: Object.keys(themes),
         setTheme: setCurrent
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
index a0b0c385cd..0424df0615 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
@@ -124,7 +124,7 @@ interface ICreateOrEditSharedFolderModalProps {
 
 const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdit }: ICreateOrEditSharedFolderModalProps) => {
   const classes = useStyles()
-  const { desktop } = useThemeSwitcher()
+  const { desktop, tablet, mobile } = useThemeSwitcher()
   const { handleCreateSharedFolder, handleEditSharedFolder, isEditingSharedFolder, isCreatingSharedFolder } = useCreateOrEditSharedFolder()
   const [sharedFolderName, setSharedFolderName] = useState("")
   const { sharedFolderReaders, sharedFolderWriters, onNewUsers, handleLookupUser, usersError, resetUsers } = useLookupSharedFolderUser()
@@ -266,6 +266,12 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
                 ...provided,
                 minHeight: 90,
                 alignContent: "start"
+              }),
+              valueContainer: (provided) => mobile && !tablet ? ({
+                ...provided,
+                paddingBottom: 24
+              }) : ({
+                ...provided
               })
             }}
             loadingMessage={t`Loading`}
@@ -292,6 +298,12 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
                 ...provided,
                 minHeight: 90,
                 alignContent: "start"
+              }),
+              valueContainer: (provided) => mobile && !tablet ? ({
+                ...provided,
+                paddingBottom: 24
+              }) : ({
+                ...provided
               })
             }}
             loadingMessage={t`Loading`}