diff --git a/src/ui/component/fileActions/view.jsx b/src/ui/component/fileActions/view.jsx
index 4ae00a8d1..f7e64bc5b 100644
--- a/src/ui/component/fileActions/view.jsx
+++ b/src/ui/component/fileActions/view.jsx
@@ -15,15 +15,34 @@ type Props = {
   openModal: (id: string, { uri: string }) => void,
   claimIsMine: boolean,
   fileInfo: FileInfo,
+  showFullscreen: boolean,
 };
 
 class FileActions extends React.PureComponent<Props> {
+  MaximizeViewer() {
+    // Get viewer container
+    const viewer = document.getElementsByClassName('content__embedded')[0];
+    viewer.webkitRequestFullscreen();
+  }
+
   render() {
-    const { fileInfo, uri, openModal, claimIsMine, claimId } = this.props;
+    const { fileInfo, uri, openModal, claimIsMine, claimId, showFullscreen } = this.props;
     const showDelete = claimIsMine || (fileInfo && Object.keys(fileInfo).length > 0);
 
     return (
       <React.Fragment>
+        {showFullscreen && (
+          <Tooltip onComponent body={__('Full screen (f)')}>
+            <Button
+              button="alt"
+              description={__('Fullscreen')}
+              icon={ICONS.FULLSCREEN}
+              onClick={() => {
+                this.MaximizeViewer();
+              }}
+            />
+          </Tooltip>
+        )}
         {showDelete && (
           <Tooltip onComponent body={__('Delete this file')}>
             <Button
diff --git a/src/ui/component/fileViewer/view.jsx b/src/ui/component/fileViewer/view.jsx
index 47d5c74e4..cbff4e9c6 100644
--- a/src/ui/component/fileViewer/view.jsx
+++ b/src/ui/component/fileViewer/view.jsx
@@ -7,10 +7,13 @@ import LoadingScreen from 'component/common/loading-screen';
 import PlayButton from './internal/play-button';
 
 const Player = React.lazy(() =>
-  import(/* webpackChunkName: "player-legacy" */
-  './internal/player')
+  import(
+    /* webpackChunkName: "player-legacy" */
+    './internal/player'
+  )
 );
 
+const F_KEYCODE = 70;
 const SPACE_BAR_KEYCODE = 32;
 
 type Props = {
@@ -49,6 +52,7 @@ type Props = {
   insufficientCredits: boolean,
   nsfw: boolean,
   thumbnail: ?string,
+  isPlayableType: boolean,
 };
 
 class FileViewer extends React.PureComponent<Props> {
@@ -63,6 +67,8 @@ class FileViewer extends React.PureComponent<Props> {
     // Don't add these variables to state because we don't need to re-render when their values change
     (this: any).startTime = undefined;
     (this: any).playTime = undefined;
+
+    (this: any).container = React.createRef();
   }
 
   componentDidMount() {
@@ -125,9 +131,40 @@ class FileViewer extends React.PureComponent<Props> {
 
   handleKeyDown(event: SyntheticKeyboardEvent<*>) {
     const { searchBarFocused } = this.props;
-    if (!searchBarFocused && event.keyCode === SPACE_BAR_KEYCODE) {
-      event.preventDefault(); // prevent page scroll
-      this.playContent();
+
+    if (!searchBarFocused) {
+      if (event.keyCode === SPACE_BAR_KEYCODE) {
+        event.preventDefault(); // prevent page scroll
+        this.playContent();
+      }
+
+      // Handle fullscreen shortcut key (f)
+      if (event.keyCode === F_KEYCODE) {
+        this.toggleFullscreen();
+      }
+    }
+  }
+
+  toggleFullscreen() {
+    const { isPlayableType } = this.props;
+
+    if (!document.webkitFullscreenElement) {
+      // Enter fullscreen mode if content is not playable
+      // Otherwise it should be handle internally on the video player
+      // or it will break the toggle fullscreen button
+      if (!isPlayableType) {
+        this.container.current.webkitRequestFullScreen();
+      }
+      // Request fullscreen mode for the video player
+      // Don't use this with the new player
+      // @if TARGET='app'
+      else {
+        const video = document.getElementsByTagName('video')[0];
+        video && video.webkitRequestFullscreen();
+      }
+      // @endif
+    } else {
+      document.webkitExitFullscreen();
     }
   }
 
@@ -257,7 +294,7 @@ class FileViewer extends React.PureComponent<Props> {
     const layoverStyle = !shouldObscureNsfw && thumbnail ? { backgroundImage: `url("${thumbnail}")` } : {};
 
     return (
-      <div className={classnames('video', {}, className)}>
+      <div className={classnames('video', {}, className)} ref={this.container}>
         {isPlaying && (
           <div className="content__view">
             {!isReadyToPlay ? (
diff --git a/src/ui/constants/icons.js b/src/ui/constants/icons.js
index 895c7b594..febeb855e 100644
--- a/src/ui/constants/icons.js
+++ b/src/ui/constants/icons.js
@@ -41,6 +41,7 @@ export const ACCOUNT = 'User';
 export const SETTINGS = 'Settings';
 export const INVITE = 'Users';
 export const FILE = 'File';
+export const FULLSCREEN = 'Maximize';
 export const OPTIONS = 'Sliders';
 export const YES = 'ThumbsUp';
 export const NO = 'ThumbsDown';
diff --git a/src/ui/index.jsx b/src/ui/index.jsx
index a928ebd7d..0a320f146 100644
--- a/src/ui/index.jsx
+++ b/src/ui/index.jsx
@@ -157,6 +157,13 @@ ipcRenderer.on('window-is-focused', () => {
 ipcRenderer.on('devtools-is-opened', () => {
   doLogWarningConsoleMessage();
 });
+
+// Force exit mode for html5 fullscreen api
+// See: https://github.com/electron/electron/issues/18188
+remote.getCurrentWindow().on('leave-full-screen', event => {
+  document.webkitExitFullscreen();
+});
+
 // @endif
 
 document.addEventListener('dragover', event => {
diff --git a/src/ui/page/file/view.jsx b/src/ui/page/file/view.jsx
index 517c59752..511677f55 100644
--- a/src/ui/page/file/view.jsx
+++ b/src/ui/page/file/view.jsx
@@ -92,7 +92,9 @@ class FilePage extends React.Component<Props> {
     setViewed(uri);
   }
 
-  componentWillReceiveProps(nextProps: Props) {
+  // This is now marked as a react lecacy method:
+  // https://reactjs.org/docs/react-component.html#unsafe_componentwillmount
+  UNSAFE_componentWillReceiveProps(nextProps: Props) {
     const { fetchFileInfo, uri, setViewed } = this.props;
     // @if TARGET='app'
     if (nextProps.fileInfo === undefined) {
@@ -152,7 +154,9 @@ class FilePage extends React.Component<Props> {
     const shouldObscureThumbnail = obscureNsfw && nsfw;
     const fileName = fileInfo ? fileInfo.file_name : null;
     const mediaType = getMediaType(contentType, fileName);
-    const showFile = PLAYABLE_MEDIA_TYPES.includes(mediaType) || PREVIEW_MEDIA_TYPES.includes(mediaType);
+    const isPreviewType = PREVIEW_MEDIA_TYPES.includes(mediaType);
+    const isPlayableType = PLAYABLE_MEDIA_TYPES.includes(mediaType);
+    const showFile = isPlayableType || isPreviewType;
 
     const speechShareable =
       costInfo && costInfo.cost === 0 && contentType && ['video', 'image'].includes(contentType.split('/')[0]);
@@ -203,6 +207,7 @@ class FilePage extends React.Component<Props> {
               className="content__embedded"
               uri={uri}
               mediaType={mediaType}
+              isPlayableType={isPlayableType}
             />
           )}
           {!showFile &&
@@ -288,7 +293,7 @@ class FilePage extends React.Component<Props> {
 
             <div className="media__action-group--large">
               <FileDownloadLink uri={uri} />
-              <FileActions uri={uri} claimId={claim.claim_id} />
+              <FileActions uri={uri} claimId={claim.claim_id} showFullscreen={isPreviewType} />
             </div>
           </div>
 
diff --git a/src/ui/scss/component/_content.scss b/src/ui/scss/component/_content.scss
index a1a8ddc80..7a2880fbe 100644
--- a/src/ui/scss/component/_content.scss
+++ b/src/ui/scss/component/_content.scss
@@ -43,6 +43,11 @@
       cursor: pointer;
     }
   }
+
+  &:-webkit-full-screen {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .content__empty {