diff --git a/app/lib/components/Sidebar.jsx b/app/lib/components/Sidebar.jsx
index e065576..28dab5f 100644
--- a/app/lib/components/Sidebar.jsx
+++ b/app/lib/components/Sidebar.jsx
@@ -1,96 +1,147 @@
-import React from 'react';
+import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import classnames from 'classnames';
 import * as appPropTypes from './appPropTypes';
 import * as requestActions from '../redux/requestActions';
+import fscreen from 'fscreen';
 
-const Sidebar = ({
-	toolbarsVisible, me, screenProducer, onLogin, onShareScreen,
-	onUnShareScreen, onNeedExtension, onLeaveMeeting
-}) =>
+class Sidebar extends Component
 {
-	let screenState;
-	let screenTip;
+	state = {
+		fullscreen: false
+	};
 
-	if (me.needExtension)
+	handleToggleFullscreen = () =>
 	{
-		screenState = 'need-extension';
-		screenTip = 'Install screen sharing extension';
-	}
-	else if (!me.canShareScreen)
+		if (fscreen.fullscreenElement) {
+			fscreen.exitFullscreen();
+		} else {
+			fscreen.requestFullscreen(document.documentElement);
+		}
+	};
+
+	handleFullscreenChange = () => {
+		this.setState({
+			fullscreen: fscreen.fullscreenElement !== null
+		})
+	};
+
+	componentDidMount()
 	{
-		screenState = 'unsupported';
-		screenTip = 'Screen sharing not supported';
-	}
-	else if (screenProducer)
-	{
-		screenState = 'on';
-		screenTip = 'Stop screen sharing';
-	}
-	else
-	{
-		screenState = 'off';
-		screenTip = 'Start screen sharing';
+		if (fscreen.fullscreenEnabled)
+		{
+			fscreen.addEventListener('fullscreenchange', this.handleFullscreenChange);
+		}
 	}
 
-	return (
-		<div className={classnames('sidebar room-controls', {
-			'visible' : toolbarsVisible
-		})}
-		>
-			<div
-				className={classnames('button', 'screen', screenState)}
-				data-tip={screenTip}
-				data-type='dark'
-				onClick={() =>
-				{
-					switch (screenState)
-					{
-						case 'on':
-						{
-							onUnShareScreen();
-							break;
-						}
-						case 'off':
-						{
-							onShareScreen();
-							break;
-						}
-						case 'need-extension':
-						{
-							onNeedExtension();
-							break;
-						}
-						default:
-						{
-							break;
-						}
-					}
-				}}
-			/>
+	componentWillUnmount()
+	{
+		if (fscreen.fullscreenEnabled)
+		{
+			fscreen.removeEventListener('fullscreenchange', this.handleFullscreenChange);
+		}
+	}
+
+	render() {
+		const {
+			toolbarsVisible, me, screenProducer, onLogin, onShareScreen,
+			onUnShareScreen, onNeedExtension, onLeaveMeeting
+		} = this.props;
+
+		let screenState;
+		let screenTip;
+	
+		if (me.needExtension)
+		{
+			screenState = 'need-extension';
+			screenTip = 'Install screen sharing extension';
+		}
+		else if (!me.canShareScreen)
+		{
+			screenState = 'unsupported';
+			screenTip = 'Screen sharing not supported';
+		}
+		else if (screenProducer)
+		{
+			screenState = 'on';
+			screenTip = 'Stop screen sharing';
+		}
+		else
+		{
+			screenState = 'off';
+			screenTip = 'Start screen sharing';
+		}
+	
+		return (
+			<div className={classnames('sidebar room-controls', {
+				'visible' : toolbarsVisible
+			})}
+			>
+				{fscreen.fullscreenEnabled && (
+					<div
+						className={classnames('button', 'fullscreen', {
+							on: this.state.fullscreen
+						})}
+						onClick={this.handleToggleFullscreen}
+						data-tip='Fullscreen'
+						data-type='dark'
+					/>
+				)}
 
-			{me.loginEnabled ?
 				<div
-					className={classnames('button', 'login', 'off', {
-						disabled : me.loginInProgress
-					})}
-					data-tip='Login'
+					className={classnames('button', 'screen', screenState)}
+					data-tip={screenTip}
 					data-type='dark'
-					onClick={() => onLogin()}
+					onClick={() =>
+					{
+						switch (screenState)
+						{
+							case 'on':
+							{
+								onUnShareScreen();
+								break;
+							}
+							case 'off':
+							{
+								onShareScreen();
+								break;
+							}
+							case 'need-extension':
+							{
+								onNeedExtension();
+								break;
+							}
+							default:
+							{
+								break;
+							}
+						}
+					}}
 				/>
-				:null
-			}
-
-			<div
-				className={classnames('button', 'leave-meeting')}
-				data-tip='Leave meeting'
-				data-type='dark'
-				onClick={() => onLeaveMeeting()}
-			/>
-		</div>
-	);
-};
+	
+				{me.loginEnabled ?
+					<div
+						className={classnames('button', 'login', 'off', {
+							disabled : me.loginInProgress
+						})}
+						data-tip='Login'
+						data-type='dark'
+						onClick={() => onLogin()}
+					/>
+					:null
+				}
+	
+				<div
+					className={classnames('button', 'leave-meeting')}
+					data-tip='Leave meeting'
+					data-type='dark'
+					onClick={() => onLeaveMeeting()}
+				/>
+			</div>
+		);
+	}
+}
 
 Sidebar.propTypes = {
 	toolbarsVisible : PropTypes.bool.isRequired,
diff --git a/app/resources/images/icon_fullscreen_exit_white.svg b/app/resources/images/icon_fullscreen_exit_white.svg
new file mode 100644
index 0000000..0d60d8e
--- /dev/null
+++ b/app/resources/images/icon_fullscreen_exit_white.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFF">
+    <path d="M0 0h24v24H0z" fill="none"/>
+    <path d="M5 16h3v3h2v-5H5v2zm3-8H5v2h5V5H8v3zm6 11h2v-3h3v-2h-5v5zm2-11V5h-2v5h5V8h-3z"/>
+</svg>
diff --git a/app/resources/images/icon_fullscreen_white.svg b/app/resources/images/icon_fullscreen_white.svg
new file mode 100644
index 0000000..c0f5762
--- /dev/null
+++ b/app/resources/images/icon_fullscreen_white.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="#FFF">
+    <path d="M0 0h24v24H0z" fill="none" />
+    <path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z" />
+</svg>
diff --git a/app/stylus/components/Room.styl b/app/stylus/components/Room.styl
index 932406c..ea3b42c 100644
--- a/app/stylus/components/Room.styl
+++ b/app/stylus/components/Room.styl
@@ -232,6 +232,14 @@
 					}
 				}
 
+				&.fullscreen {
+					background-image: url('/resources/images/icon_fullscreen_white.svg');
+
+					&.on {
+						background-image: url('/resources/images/icon_fullscreen_exit_white.svg');
+					}
+				}
+
 				&.screen {
 					&.on {
 						background-image: url('/resources/images/no-share-screen-black.svg');
@@ -250,6 +258,7 @@
 						background-image: url('/resources/images/share-screen-extension.svg');
 					}
 				}
+
 				&.raise-hand {
 					background-image: url('/resources/images/icon-hand-white.svg');