diff --git a/app/lib/components/FullScreenView.jsx b/app/lib/components/FullScreenView.jsx
index cee2dd0..ebf62f4 100644
--- a/app/lib/components/FullScreenView.jsx
+++ b/app/lib/components/FullScreenView.jsx
@@ -11,7 +11,8 @@ const FullScreenView = (props) =>
 	const {
 		advancedMode,
 		consumer,
-		toggleConsumerFullscreen
+		toggleConsumerFullscreen,
+		toolbarsVisible
 	} = props;
 
 	if (!consumer)
@@ -39,7 +40,9 @@ const FullScreenView = (props) =>
 
 			<div className='controls'>
 				<div
-					className={classnames('button', 'fullscreen')}
+					className={classnames('button', 'fullscreen', 'room-controls', {
+						visible: toolbarsVisible
+					})}
 					onClick={(e) =>
 					{
 						e.stopPropagation();
@@ -63,13 +66,15 @@ FullScreenView.propTypes =
 {
 	advancedMode             : PropTypes.bool,
 	consumer                 : appPropTypes.Consumer,
-	toggleConsumerFullscreen : PropTypes.func.isRequired
+	toggleConsumerFullscreen : PropTypes.func.isRequired,
+	toolbarsVisible          : PropTypes.bool
 };
 
 const mapStateToProps = (state) =>
 {
 	return {
-		consumer : state.consumers[state.room.fullScreenConsumer]
+		consumer : state.consumers[state.room.fullScreenConsumer],
+		toolbarsVisible : state.room.toolbarsVisible
 	};
 };
 
diff --git a/app/stylus/components/Room.styl b/app/stylus/components/Room.styl
index dcc62d5..142394e 100644
--- a/app/stylus/components/Room.styl
+++ b/app/stylus/components/Room.styl
@@ -179,13 +179,13 @@
 
 .room-controls {
 	visibility: hidden;
-	animation: fade-out 0.5s;
+	animation: fade-out 0.3s;
 	opacity: 0;
 
 	&.visible {
 		visibility: visible;
 		opacity: 1;
-		animation: fade-in 0.5s;
+		animation: fade-in 0.3s;
 	}
 }
 
diff --git a/app/stylus/index.styl b/app/stylus/index.styl
index 5e67e46..fa63dee 100644
--- a/app/stylus/index.styl
+++ b/app/stylus/index.styl
@@ -5,6 +5,7 @@ global-reset();
 @import './mixins';
 @import './fonts';
 @import './reset';
+@import './keyframes';
 
 html {
 	height: 100%;
diff --git a/app/stylus/keyframes.styl b/app/stylus/keyframes.styl
new file mode 100644
index 0000000..76a728e
--- /dev/null
+++ b/app/stylus/keyframes.styl
@@ -0,0 +1,21 @@
+@keyframes fade-in {
+	from {
+		opacity: 0;
+		visibility: hidden;
+	}
+
+ 	to {
+		visibility: visible;
+	}
+}
+
+@keyframes fade-out {
+	from {
+		visibility: visible;
+	}
+
+	to {
+		opacity: 0;
+		visibility: hidden;
+	}
+} 
\ No newline at end of file