diff --git a/Swiftfin tvOS/Views/SelectUserView/Components/UserGridButton.swift b/Swiftfin tvOS/Views/SelectUserView/Components/UserGridButton.swift
index a9e0a715f..8301ce71b 100644
--- a/Swiftfin tvOS/Views/SelectUserView/Components/UserGridButton.swift	
+++ b/Swiftfin tvOS/Views/SelectUserView/Components/UserGridButton.swift	
@@ -63,6 +63,8 @@ extension SelectUserView {
                 ),
                 pipeline: .Swiftfin.local
             )
+            .aspectRatio(1, contentMode: .fill)
+            .clipShape(.circle)
             .overlay {
                 if isEditing {
                     ZStack(alignment: .bottom) {
diff --git a/Swiftfin/Views/SelectUserView/Components/UserGridButton.swift b/Swiftfin/Views/SelectUserView/Components/UserGridButton.swift
index 19485597a..55266be0c 100644
--- a/Swiftfin/Views/SelectUserView/Components/UserGridButton.swift
+++ b/Swiftfin/Views/SelectUserView/Components/UserGridButton.swift
@@ -67,6 +67,8 @@ extension SelectUserView {
                             pipeline: .Swiftfin.local
                         )
                     }
+                    .aspectRatio(1, contentMode: .fill)
+                    .clipShape(.circle)
                     .overlay {
                         if isEditing {
                             ZStack(alignment: .bottomTrailing) {