diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7aac3a8fd..9f7a8e5ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Fixed
+- Fix other video and song scanners to include videos contained directly in top-level folders that are added to a library 
 
 ## [0.3.3-alpha] - 2021-12-12
 ### Fixed
diff --git a/ErsatzTV.Core/Metadata/OtherVideoFolderScanner.cs b/ErsatzTV.Core/Metadata/OtherVideoFolderScanner.cs
index d3dc05ebd..a5b0c291a 100644
--- a/ErsatzTV.Core/Metadata/OtherVideoFolderScanner.cs
+++ b/ErsatzTV.Core/Metadata/OtherVideoFolderScanner.cs
@@ -77,9 +77,15 @@ namespace ErsatzTV.Core.Metadata
             var foldersCompleted = 0;
 
             var folderQueue = new Queue<string>();
+
+            if (ShouldIncludeFolder(libraryPath.Path))
+            {
+                folderQueue.Enqueue(libraryPath.Path);
+            }
+
             foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
-                .Filter(ShouldIncludeFolder)
-                .OrderBy(identity))
+                         .Filter(ShouldIncludeFolder)
+                         .OrderBy(identity))
             {
                 folderQueue.Enqueue(folder);
             }
diff --git a/ErsatzTV.Core/Metadata/SongFolderScanner.cs b/ErsatzTV.Core/Metadata/SongFolderScanner.cs
index 7d1ee37f9..ad7e06cbc 100644
--- a/ErsatzTV.Core/Metadata/SongFolderScanner.cs
+++ b/ErsatzTV.Core/Metadata/SongFolderScanner.cs
@@ -79,9 +79,15 @@ namespace ErsatzTV.Core.Metadata
             var foldersCompleted = 0;
 
             var folderQueue = new Queue<string>();
+            
+            if (ShouldIncludeFolder(libraryPath.Path))
+            {
+                folderQueue.Enqueue(libraryPath.Path);
+            }
+
             foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
-                .Filter(ShouldIncludeFolder)
-                .OrderBy(identity))
+                         .Filter(ShouldIncludeFolder)
+                         .OrderBy(identity))
             {
                 folderQueue.Enqueue(folder);
             }