diff --git a/app/lib/components/FullView.jsx b/app/lib/components/FullView.jsx
index 28c1094..0011067 100644
--- a/app/lib/components/FullView.jsx
+++ b/app/lib/components/FullView.jsx
@@ -52,21 +52,21 @@ export default class FullView extends React.Component
 
 		this._setTracks(videoTrack);
 
-		if (fscreen.fullscreenEnabled) 
+		if (fscreen.fullscreenEnabled)
 		{
 			fscreen.addEventListener('fullscreenchange', this.handleExitFullscreen, false);
 			fscreen.requestFullscreen(this.video.current);
 		}
 	}
 
-	componentWillUnmount() 
+	componentWillUnmount()
 	{
 		fscreen.removeEventListener('fullscreenchange', this.handleExitFullscreen);
 	}
 
-	handleExitFullscreen = () => 
+	handleExitFullscreen = () =>
 	{
-		if (!fscreen.fullscreenElement) 
+		if (!fscreen.fullscreenElement)
 		{
 			this.props.toggleFullscreen();
 		}
diff --git a/app/lib/components/Peer.jsx b/app/lib/components/Peer.jsx
index 2b06f13..bf07925 100644
--- a/app/lib/components/Peer.jsx
+++ b/app/lib/components/Peer.jsx
@@ -147,7 +147,11 @@ class Peer extends Component
 
 				{screenConsumer ?
 					<div className={classnames('view-container', 'screen')} style={style}>
-						<div className='controls'>
+						<div
+							className={classnames('controls', {
+								visible : this.state.controlsVisible
+							})}
+						>
 							<div
 								className={classnames('button', 'screen', {
 									on       : screenVisible,