diff --git a/app/lib/components/Peers.jsx b/app/lib/components/Peers.jsx
index 9733d24..fccebb8 100644
--- a/app/lib/components/Peers.jsx
+++ b/app/lib/components/Peers.jsx
@@ -22,9 +22,9 @@ class Peers extends React.Component
 
 	updateDimensions = () =>
 	{
-		const n = this.props.videoStreams ? this.props.videoStreams : 0;
+		const n = this.props.boxes;
 
-		if (n == 0)
+		if (n === 0)
 		{
 			return;
 		}
@@ -121,27 +121,24 @@ class Peers extends React.Component
 }
 
 Peers.propTypes =
-{
-	advancedMode      : PropTypes.bool,
-	peers             : PropTypes.arrayOf(appPropTypes.Peer).isRequired,
-	videoStreams      : PropTypes.any,
-	activeSpeakerName : PropTypes.string,
-	toolAreaOpen      : PropTypes.bool
-};
+	{
+		advancedMode      : PropTypes.bool,
+		peers             : PropTypes.arrayOf(appPropTypes.Peer).isRequired,
+		boxes             : PropTypes.number,
+		activeSpeakerName : PropTypes.string,
+		toolAreaOpen      : PropTypes.bool
+	};
 
 const mapStateToProps = (state) =>
 {
-	const peersArray = Object.values(state.peers);
-	const videoStreamsArray = Object.values(state.consumers);
-	const videoStreams =
-		videoStreamsArray.filter((consumer) =>
-		{
-			return (consumer.source === 'webcam' || consumer.source === 'screen');
-		}).length;
+	const peers = Object.values(state.peers);
+
+	const boxes = peers.length + Object.values(state.consumers)
+		.filter((consumer) => consumer.source === 'screen').length;
 
 	return {
-		peers             : peersArray,
-		videoStreams      : videoStreams,
+		peers,
+		boxes,
 		activeSpeakerName : state.room.activeSpeakerName,
 		toolAreaOpen      : state.toolarea.toolAreaOpen
 	};