diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index 867ac787b..491bc2083 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -78,6 +78,7 @@
 }
 
 .session-conversation {
+  position: relative;
   flex-grow: 1;
   display: flex;
   flex-direction: column;
diff --git a/stylesheets/_session_group_panel.scss b/stylesheets/_session_group_panel.scss
index f2e4e3010..250672916 100644
--- a/stylesheets/_session_group_panel.scss
+++ b/stylesheets/_session_group_panel.scss
@@ -1,7 +1,7 @@
 .group-settings {
   display: flex;
   flex-direction: column;
-  height: 100vh;
+  height: 100%;
   width: -webkit-fill-available;
 
   align-items: center;
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 8672068c8..6f15fe3f7 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -1,9 +1,10 @@
+import _ from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { SessionIconButton } from '../icon';
-import _ from 'lodash';
 // tslint:disable-next-line: no-submodule-imports
-import useInterval from 'react-use/lib/useInterval';
 import { useDispatch, useSelector } from 'react-redux';
+import useInterval from 'react-use/lib/useInterval';
+import styled from 'styled-components';
 import { Data } from '../../data/data';
 import {
   deleteAllMessagesByConvoIdWithConfirmation,
@@ -18,16 +19,6 @@ import {
 import { Constants } from '../../session';
 import { closeRightPanel } from '../../state/ducks/conversations';
 import { isRightPanelShowing } from '../../state/selectors/conversations';
-import { getTimerOptions } from '../../state/selectors/timerOptions';
-import { AttachmentTypeWithPath } from '../../types/Attachment';
-import { Avatar, AvatarSize } from '../avatar/Avatar';
-import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
-import { SessionDropdown } from '../basic/SessionDropdown';
-import { SpacerLG } from '../basic/Text';
-import { MediaItemType } from '../lightbox/LightboxGallery';
-import { MediaGallery } from './media-gallery/MediaGallery';
-import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
-import styled from 'styled-components';
 import {
   useSelectedConversationKey,
   useSelectedDisplayNameInProfile,
@@ -40,6 +31,15 @@ import {
   useSelectedSubscriberCount,
   useSelectedWeAreAdmin,
 } from '../../state/selectors/selectedConversation';
+import { getTimerOptions } from '../../state/selectors/timerOptions';
+import { AttachmentTypeWithPath } from '../../types/Attachment';
+import { getAbsoluteAttachmentPath } from '../../types/MessageAttachment';
+import { Avatar, AvatarSize } from '../avatar/Avatar';
+import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
+import { SessionDropdown } from '../basic/SessionDropdown';
+import { SpacerLG } from '../basic/Text';
+import { MediaItemType } from '../lightbox/LightboxGallery';
+import { MediaGallery } from './media-gallery/MediaGallery';
 
 async function getMediaGalleryProps(
   conversationId: string