diff --git a/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js b/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
index cc735e995f..039d820faf 100644
--- a/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
+++ b/packages/client/src/pages/PortalSettings/categories/common/Branding/companyInfoSettings.js
@@ -34,6 +34,7 @@ const StyledComponent = styled.div`
 
   .save-cancel-buttons {
     margin-top: 24px;
+    bottom: 0;
   }
 
   .description {
@@ -45,6 +46,12 @@ const StyledComponent = styled.div`
       display: none;
     }
   }
+
+  @media (max-height: 700px) {
+    .save-cancel-buttons {
+      bottom: auto;
+    }
+  }
 `;
 
 const CompanyInfoSettings = (props) => {
@@ -443,6 +450,8 @@ const CompanyInfoSettings = (props) => {
           cancelButtonLabel={t("Common:Restore")}
           reminderText={t("YouHaveUnsavedChanges")}
           displaySettings={true}
+          hasScroll={true}
+          hideBorder={true}
           showReminder={(isSettingPaid && showReminder) || isLoading}
           disableRestoreToDefault={companyInfoSettingsIsDefault || isLoading}
           additionalClassSaveButton="company-info-save"
diff --git a/packages/components/context-menu-button/index.js b/packages/components/context-menu-button/index.js
index 47acb29a29..78ab244ea2 100644
--- a/packages/components/context-menu-button/index.js
+++ b/packages/components/context-menu-button/index.js
@@ -10,6 +10,7 @@ import Aside from "../aside";
 import Heading from "../heading";
 import Link from "../link";
 import { desktop, isTablet, isMobile } from "../utils/device";
+import {  isTablet as Tablet } from "react-device-detect";
 
 import {
   StyledBodyContent,
@@ -214,7 +215,7 @@ class ContextMenuButton extends React.Component {
             forwardedRef={this.ref}
             clickOutsideAction={this.clickOutsideAction}
             columnCount={columnCount}
-            withBackdrop={isTablet() || isMobile()}
+            withBackdrop={isTablet() || isMobile() || Tablet}
             zIndex={zIndex}
             isDefaultMode={usePortal}
           >