diff --git a/app/soapbox/components/ui/modal/modal.tsx b/app/soapbox/components/ui/modal/modal.tsx
index 5ac16ca14..5c01c513a 100644
--- a/app/soapbox/components/ui/modal/modal.tsx
+++ b/app/soapbox/components/ui/modal/modal.tsx
@@ -10,6 +10,19 @@ const messages = defineMessages({
   confirm: { id: 'confirmations.delete.confirm', defaultMessage: 'Delete' },
 });
 
+type Widths = 'xs' | 'sm' | 'md' | 'lg' | 'xl' | '2xl' | '3xl' | '4xl'
+
+const widths = {
+  xs: 'max-w-xs',
+  sm: 'max-w-sm',
+  md: 'max-w-base',
+  lg: 'max-w-lg',
+  xl: 'max-w-xl',
+  '2xl': 'max-w-2xl',
+  '3xl': 'max-w-3xl',
+  '4xl': 'max-w-4xl',
+};
+
 interface IModal {
   /** Callback when the modal is cancelled. */
   cancelAction?: () => void,
@@ -37,6 +50,7 @@ interface IModal {
   skipFocus?: boolean,
   /** Title text for the modal. */
   title: string | React.ReactNode,
+  width?: Widths,
 }
 
 /** Displays a modal dialog box. */
@@ -55,6 +69,7 @@ const Modal: React.FC<IModal> = ({
   secondaryText,
   skipFocus = false,
   title,
+  width = 'xl',
 }) => {
   const intl = useIntl();
   const buttonRef = React.useRef<HTMLButtonElement>(null);
@@ -66,7 +81,7 @@ const Modal: React.FC<IModal> = ({
   }, [skipFocus, buttonRef]);
 
   return (
-    <div data-testid='modal' className='block w-full max-w-xl p-6 mx-auto overflow-hidden text-left align-middle transition-all transform bg-white dark:bg-slate-800 text-black dark:text-white shadow-xl rounded-2xl pointer-events-auto'>
+    <div data-testid='modal' className={classNames('block w-full p-6 mx-auto overflow-hidden text-left align-middle transition-all transform bg-white dark:bg-slate-800 text-black dark:text-white shadow-xl rounded-2xl pointer-events-auto', widths[width])}>
       <div className='sm:flex sm:items-start w-full justify-between'>
         <div className='w-full'>
           <div
diff --git a/app/soapbox/features/ui/components/hotkeys_modal.tsx b/app/soapbox/features/ui/components/hotkeys_modal.tsx
index 5203e0e5c..9aa9ebc3d 100644
--- a/app/soapbox/features/ui/components/hotkeys_modal.tsx
+++ b/app/soapbox/features/ui/components/hotkeys_modal.tsx
@@ -9,6 +9,18 @@ interface IHotkeysModal {
   onClose: () => void,
 }
 
+const Hotkey: React.FC<{ children: React.ReactNode }> = ({ children }) => (
+  <kbd className='px-1.5 py-1 bg-primary-50 dark:bg-slate-700 border border-solid border-primary-200 rounded-md dark:border-slate-500 text-xs font-sans'>
+    {children}
+  </kbd>
+);
+
+const TableCell: React.FC<{ children: React.ReactNode }> = ({ children }) => (
+  <td className='pb-3 px-2'>
+    {children}
+  </td>
+);
+
 const HotkeysModal: React.FC<IHotkeysModal> = ({ onClose }) => {
   const features = useAppSelector((state) => getFeatures(state.instance));
 
@@ -16,142 +28,143 @@ const HotkeysModal: React.FC<IHotkeysModal> = ({ onClose }) => {
     <Modal
       title={<FormattedMessage id='keyboard_shortcuts.heading' defaultMessage='Keyboard shortcuts' />}
       onClose={onClose}
+      width='4xl'
     >
-      <div className='compose-modal__content'>
+      <div className='flex flex-col lg:flex-row text-xs'>
         <table>
           <thead>
             <tr>
-              <th><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th>
+              <th className='pb-2 font-bold'><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th>
             </tr>
           </thead>
           <tbody>
             <tr>
-              <td><kbd>r</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.reply' defaultMessage='to reply' /></td>
+              <TableCell><Hotkey>r</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.reply' defaultMessage='to reply' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>m</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.mention' defaultMessage='to mention author' /></td>
+              <TableCell><Hotkey>m</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.mention' defaultMessage='to mention author' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>p</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.profile' defaultMessage="to open author's profile" /></td>
+              <TableCell><Hotkey>p</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.profile' defaultMessage="to open author's profile" /></TableCell>
             </tr>
             <tr>
-              <td><kbd>f</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.favourite' defaultMessage='to like' /></td>
+              <TableCell><Hotkey>f</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.favourite' defaultMessage='to like' /></TableCell>
             </tr>
             {features.emojiReacts && (
               <tr>
-                <td><kbd>e</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.react' defaultMessage='to react' /></td>
+                <TableCell><Hotkey>e</Hotkey></TableCell>
+                <TableCell><FormattedMessage id='keyboard_shortcuts.react' defaultMessage='to react' /></TableCell>
               </tr>
             )}
             <tr>
-              <td><kbd>b</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to repost' /></td>
+              <TableCell><Hotkey>b</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.boost' defaultMessage='to repost' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>enter</kbd>, <kbd>o</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.enter' defaultMessage='to open post' /></td>
+              <TableCell><Hotkey>enter</Hotkey>, <Hotkey>o</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.enter' defaultMessage='to open post' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>a</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.open_media' defaultMessage='to open media' /></td>
+              <TableCell><Hotkey>a</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.open_media' defaultMessage='to open media' /></TableCell>
             </tr>
           </tbody>
         </table>
         <table>
           <thead>
             <tr>
-              <th><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th>
+              <th className='pb-2 font-bold'><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th>
             </tr>
           </thead>
           <tbody>
             {features.spoilers && (
               <tr>
-                <td><kbd>x</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.toggle_hidden' defaultMessage='to show/hide text behind CW' /></td>
+                <TableCell><Hotkey>x</Hotkey></TableCell>
+                <TableCell><FormattedMessage id='keyboard_shortcuts.toggle_hidden' defaultMessage='to show/hide text behind CW' /></TableCell>
               </tr>
             )}
             {features.spoilers && (
               <tr>
-                <td><kbd>h</kbd></td>
-                <td><FormattedMessage id='keyboard_shortcuts.toggle_sensitivity' defaultMessage='to show/hide media' /></td>
+                <TableCell><Hotkey>h</Hotkey></TableCell>
+                <TableCell><FormattedMessage id='keyboard_shortcuts.toggle_sensitivity' defaultMessage='to show/hide media' /></TableCell>
               </tr>
             )}
             <tr>
-              <td><kbd>up</kbd>, <kbd>k</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></td>
+              <TableCell><Hotkey>up</Hotkey>, <Hotkey>k</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.up' defaultMessage='to move up in the list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>down</kbd>, <kbd>j</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></td>
+              <TableCell><Hotkey>down</Hotkey>, <Hotkey>j</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.down' defaultMessage='to move down in the list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>n</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.compose' defaultMessage='to focus the compose textarea' /></td>
+              <TableCell><Hotkey>n</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.compose' defaultMessage='to focus the compose textarea' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>alt</kbd> + <kbd>n</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a new post' /></td>
+              <TableCell><Hotkey>alt</Hotkey> + <Hotkey>n</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.toot' defaultMessage='to start a new post' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>backspace</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></td>
+              <TableCell><Hotkey>backspace</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.back' defaultMessage='to navigate back' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>s</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></td>
+              <TableCell><Hotkey>s</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.search' defaultMessage='to focus search' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>esc</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.unfocus' defaultMessage='to un-focus compose textarea/search' /></td>
+              <TableCell><Hotkey>esc</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.unfocus' defaultMessage='to un-focus compose textarea/search' /></TableCell>
             </tr>
           </tbody>
         </table>
         <table>
           <thead>
             <tr>
-              <th><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th>
+              <th className='pb-2 font-bold'><FormattedMessage id='keyboard_shortcuts.hotkey' defaultMessage='Hotkey' /></th>
             </tr>
           </thead>
           <tbody>
             <tr>
-              <td><kbd>g</kbd> + <kbd>h</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.home' defaultMessage='to open home timeline' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>h</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.home' defaultMessage='to open home timeline' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>n</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.notifications' defaultMessage='to open notifications column' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>n</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.notifications' defaultMessage='to open notifications column' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>f</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.favourites' defaultMessage='to open likes list' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>f</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.favourites' defaultMessage='to open likes list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>p</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned posts list' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>p</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.pinned' defaultMessage='to open pinned posts list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>u</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.my_profile' defaultMessage='to open your profile' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>u</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.my_profile' defaultMessage='to open your profile' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>b</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.blocked' defaultMessage='to open blocked users list' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>b</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.blocked' defaultMessage='to open blocked users list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>m</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.muted' defaultMessage='to open muted users list' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>m</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.muted' defaultMessage='to open muted users list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>g</kbd> + <kbd>r</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.requests' defaultMessage='to open follow requests list' /></td>
+              <TableCell><Hotkey>g</Hotkey> + <Hotkey>r</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.requests' defaultMessage='to open follow requests list' /></TableCell>
             </tr>
             <tr>
-              <td><kbd>?</kbd></td>
-              <td><FormattedMessage id='keyboard_shortcuts.legend' defaultMessage='to display this legend' /></td>
+              <TableCell><Hotkey>?</Hotkey></TableCell>
+              <TableCell><FormattedMessage id='keyboard_shortcuts.legend' defaultMessage='to display this legend' /></TableCell>
             </tr>
           </tbody>
         </table>
diff --git a/app/styles/application.scss b/app/styles/application.scss
index dd59d8754..03f8ff65d 100644
--- a/app/styles/application.scss
+++ b/app/styles/application.scss
@@ -43,7 +43,6 @@
 @import 'components/user-panel';
 @import 'components/compose-form';
 @import 'components/sidebar-menu';
-@import 'components/hotkeys-modal';
 @import 'components/emoji-reacts';
 @import 'components/status';
 @import 'components/reply-indicator';
diff --git a/app/styles/components/hotkeys-modal.scss b/app/styles/components/hotkeys-modal.scss
deleted file mode 100644
index b246e115a..000000000
--- a/app/styles/components/hotkeys-modal.scss
+++ /dev/null
@@ -1,51 +0,0 @@
-.hotkeys-modal {
-  padding: 8px 0 0;
-  overflow: hidden;
-  background-color: var(--background-color);
-  border-radius: 6px;
-  flex-direction: column;
-
-  @media screen and (max-width: 960px) {
-    height: 90vh;
-  }
-
-  .compose-modal__content {
-    background-color: var(--background-color);
-    margin: 5px;
-
-    @media screen and (max-width: 960px) {
-      flex-direction: column;
-      overflow: hidden;
-      overflow-y: scroll;
-      height: calc(100% - 80px);
-      -webkit-overflow-scrolling: touch;
-    }
-  }
-
-  table {
-    thead {
-      display: block;
-      padding-left: 10px;
-      margin-bottom: 10px;
-      color: var(--primary-text-color);
-      font-size: 16px;
-      font-weight: 600;
-    }
-
-    tr {
-      font-size: 12px;
-    }
-
-    td {
-      padding: 0 10px 8px;
-    }
-
-    kbd {
-      display: inline-block;
-      padding: 2px 8px;
-      background-color: var(--brand-color--med);
-      border: 1px solid var(--brand-color--med);
-      border-radius: 4px;
-    }
-  }
-}