diff --git a/src/Files.App/Constants.cs b/src/Files.App/Constants.cs
index 578c8951644f..d3e23dc9d15d 100644
--- a/src/Files.App/Constants.cs
+++ b/src/Files.App/Constants.cs
@@ -7,19 +7,6 @@ namespace Files.App
 {
 	public static class Constants
 	{
-		public static class AdaptiveLayout
-		{
-			public const float ExtraLargeThreshold = 85.0f;
-
-			public const float LargeThreshold = 80.0f;
-
-			public const float MediumThreshold = 60.0f;
-
-			public const float SmallThreshold = 25.0f;
-
-			public const float ExtraSmallThreshold = 15.0f;
-		}
-
 		// The following constants will be replaced with actual values by the Files CI workflow
 		public static class AutomatedWorkflowInjectionKeys
 		{
diff --git a/src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs b/src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs
index 83c5ebe14eaa..ffc58fabc491 100644
--- a/src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs
+++ b/src/Files.App/Helpers/Layout/AdaptiveLayoutHelpers.cs
@@ -3,8 +3,6 @@
 
 using Files.App.ViewModels.Previews;
 using Files.Shared.Helpers;
-using Windows.Storage;
-using static Files.App.Constants.AdaptiveLayout;
 
 namespace Files.App.Helpers
 {
@@ -67,34 +65,17 @@ private static Layouts GetContentLayout(IList<ListedItem> filesAndFolders)
 			if (filesAndFolders.Count is 0)
 				return Layouts.None;
 
-			float folderPercentage = 100f * filesAndFolders.Count(IsFolder) / itemCount;
-			float imagePercentage = 100f * filesAndFolders.Count(IsImage) / itemCount;
 			float mediaPercentage = 100f * filesAndFolders.Count(IsMedia) / itemCount;
-			float miscPercentage = 100f - (folderPercentage + imagePercentage + mediaPercentage);
 
-			if (folderPercentage + miscPercentage > LargeThreshold)
-				return Layouts.Detail;
-			if (imagePercentage > ExtraLargeThreshold)
+			if (mediaPercentage > 60f)
 				return Layouts.Grid;
-			if (imagePercentage <= MediumThreshold)
-				return Layouts.Detail;
-			if (100f - imagePercentage <= SmallThreshold)
-				return Layouts.Detail;
-			if (folderPercentage + miscPercentage <= ExtraSmallThreshold)
-				return Layouts.Detail;
-			return Layouts.Grid;
-
-			static bool IsFolder(ListedItem item)
-				=> item.PrimaryItemAttribute is StorageItemTypes.Folder;
-
-			static bool IsImage(ListedItem item)
-				=> !string.IsNullOrEmpty(item.FileExtension)
-				&& ImagePreviewViewModel.ContainsExtension(item.FileExtension.ToLowerInvariant());
+			return Layouts.Detail;
 
 			static bool IsMedia(ListedItem item)
 				=> !string.IsNullOrEmpty(item.FileExtension)
 				&& (FileExtensionHelpers.IsAudioFile(item.FileExtension)
-				|| FileExtensionHelpers.IsVideoFile(item.FileExtension));
+				|| FileExtensionHelpers.IsVideoFile(item.FileExtension)
+				|| FileExtensionHelpers.IsImageFile(item.FileExtension));
 		}
 
 		private enum Layouts
diff --git a/src/Files.Shared/Helpers/FileExtensionHelpers.cs b/src/Files.Shared/Helpers/FileExtensionHelpers.cs
index a3245a11765d..da70539b7691 100644
--- a/src/Files.Shared/Helpers/FileExtensionHelpers.cs
+++ b/src/Files.Shared/Helpers/FileExtensionHelpers.cs
@@ -77,7 +77,7 @@ public static bool IsCompatibleToSetAsWindowsWallpaper(string? fileExtensionToCh
 		/// <returns><c>true</c> if the fileExtensionToCheck is an audio file; otherwise, <c>false</c>.</returns>
 		public static bool IsAudioFile(string? fileExtensionToCheck)
 		{
-			return HasExtension(fileExtensionToCheck, ".mp3", ".m4a", ".wav", ".wma", ".aac", ".adt", ".adts", ".cda", ".flac");
+			return HasExtension(fileExtensionToCheck, ".mp3", ".m4a", ".ogg", ".oga", ".wav", ".wma", ".aac", ".adt", ".adts", ".cda", ".flac");
 		}
 
 		/// <summary>