diff --git a/src/components/Room/PeerVideo.tsx b/src/components/Room/PeerVideo.tsx
index f6d9231..980642c 100644
--- a/src/components/Room/PeerVideo.tsx
+++ b/src/components/Room/PeerVideo.tsx
@@ -5,11 +5,24 @@ import { PeerNameDisplay } from 'components/PeerNameDisplay'
 
 interface PeerVideoProps {
   isSelf?: boolean
+  numberOfPeers: number
   userId: string
   videoStream: MediaStream
 }
 
-export const PeerVideo = ({ isSelf, userId, videoStream }: PeerVideoProps) => {
+// Adapted from https://www.geeksforgeeks.org/find-the-next-perfect-square-greater-than-a-given-number/
+const nextPerfectSquare = (base: number) => {
+  const nextInteger = Math.floor(Math.sqrt(base)) + 1
+
+  return nextInteger * nextInteger
+}
+
+export const PeerVideo = ({
+  isSelf,
+  numberOfPeers,
+  userId,
+  videoStream,
+}: PeerVideoProps) => {
   const videoRef = useRef<HTMLVideoElement>(null)
 
   useEffect(() => {
@@ -20,15 +33,20 @@ export const PeerVideo = ({ isSelf, userId, videoStream }: PeerVideoProps) => {
     video.srcObject = videoStream
   }, [videoRef, videoStream])
 
+  const sizePercent = 100 / Math.sqrt(nextPerfectSquare(numberOfPeers - 1))
+
   return (
     <Paper
       sx={{
-        py: 2,
-        margin: '0.5em',
-        flexShrink: 1,
-        overflow: 'auto',
         display: 'flex',
         flexDirection: 'column',
+        flexShrink: 1,
+        justifyContent: 'center',
+        margin: '0.5em',
+        overflow: 'auto',
+        py: 2,
+        width: `calc(${sizePercent}% - 1em)`,
+        height: `calc(${sizePercent}% - 1em)`,
       }}
       elevation={10}
     >
diff --git a/src/components/Room/RoomVideoDisplay.tsx b/src/components/Room/RoomVideoDisplay.tsx
index 1980dae..ebc77d0 100644
--- a/src/components/Room/RoomVideoDisplay.tsx
+++ b/src/components/Room/RoomVideoDisplay.tsx
@@ -35,27 +35,37 @@ export const RoomVideoDisplay = ({ userId }: RoomVideoDisplayProps) => {
     []
   )
 
+  const numberOfPeers = (selfVideoStream ? 1 : 0) + peersWithVideo.length
+
   return (
     <Paper
       className="RoomVideoDisplay"
       elevation={3}
       square
       sx={{
-        alignItems: 'stretch',
+        alignContent: 'center',
+        alignItems: 'center',
         display: 'flex',
-        flexDirection: 'column',
+        flexDirection: numberOfPeers === 1 ? 'column' : 'row',
         flexGrow: 1,
+        flexWrap: 'wrap',
         justifyContent: 'center',
         overflow: 'auto',
         width: '75%',
       }}
     >
       {selfVideoStream && (
-        <PeerVideo isSelf userId={userId} videoStream={selfVideoStream} />
+        <PeerVideo
+          isSelf
+          numberOfPeers={numberOfPeers}
+          userId={userId}
+          videoStream={selfVideoStream}
+        />
       )}
       {peersWithVideo.map(peerWithVideo => (
         <PeerVideo
           key={peerWithVideo.peer.peerId}
+          numberOfPeers={numberOfPeers}
           userId={peerWithVideo.peer.userId}
           videoStream={peerWithVideo.videoStream}
         />