diff --git a/stylesheets/components/CallingScreenSharingController.scss b/stylesheets/components/CallingScreenSharingController.scss
index e062a9b6eb..63c300a1cd 100644
--- a/stylesheets/components/CallingScreenSharingController.scss
+++ b/stylesheets/components/CallingScreenSharingController.scss
@@ -15,7 +15,14 @@
     text-overflow: ellipsis;
     user-select: none;
     white-space: nowrap;
-    width: 212px;
+    width: 350px;
+  }
+
+  &__button {
+    max-width: 120px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   &__buttons {
diff --git a/ts/components/CallingScreenSharingController.stories.tsx b/ts/components/CallingScreenSharingController.stories.tsx
index 208ee32b41..1c318bd805 100644
--- a/ts/components/CallingScreenSharingController.stories.tsx
+++ b/ts/components/CallingScreenSharingController.stories.tsx
@@ -15,11 +15,11 @@ import enMessages from '../../_locales/en/messages.json';
 
 const i18n = setupI18n('en', enMessages);
 
-const createProps = (): PropsType => ({
+const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
   i18n,
   onCloseController: action('on-close-controller'),
   onStopSharing: action('on-stop-sharing'),
-  presentedSourceName: 'Application',
+  presentedSourceName: overrideProps.presentedSourceName || 'Application',
 });
 
 const story = storiesOf('Components/CallingScreenSharingController', module);
@@ -27,3 +27,14 @@ const story = storiesOf('Components/CallingScreenSharingController', module);
 story.add('Controller', () => {
   return <CallingScreenSharingController {...createProps()} />;
 });
+
+story.add('Really long app name', () => {
+  return (
+    <CallingScreenSharingController
+      {...createProps({
+        presentedSourceName:
+          'A really long application name that is super long',
+      })}
+    />
+  );
+});
diff --git a/ts/components/CallingScreenSharingController.tsx b/ts/components/CallingScreenSharingController.tsx
index 054b245a27..bc1edea702 100644
--- a/ts/components/CallingScreenSharingController.tsx
+++ b/ts/components/CallingScreenSharingController.tsx
@@ -24,7 +24,11 @@ export const CallingScreenSharingController = ({
         {i18n('calling__presenting--info', [presentedSourceName])}
       </div>
       <div className="module-CallingScreenSharingController__buttons">
-        <Button onClick={onStopSharing} variant={ButtonVariant.Destructive}>
+        <Button
+          className="module-CallingScreenSharingController__button"
+          onClick={onStopSharing}
+          variant={ButtonVariant.Destructive}
+        >
           {i18n('calling__presenting--stop')}
         </Button>
         <button