diff --git a/PicView/App.config b/PicView/App.config
index c8d267af..5d08b348 100644
--- a/PicView/App.config
+++ b/PicView/App.config
@@ -136,6 +136,9 @@
             <setting name="MagentaAlpha" serializeAs="String">
                 <value>#F2FF6CD4</value>
             </setting>
+            <setting name="IncludeSubDirectories" serializeAs="String">
+                <value>False</value>
+            </setting>
         </PicView.Properties.Settings>
     </userSettings>
   <runtime>
diff --git a/PicView/FileHandling/FileLists.cs b/PicView/FileHandling/FileLists.cs
index 27f0a1d8..12bc890b 100644
--- a/PicView/FileHandling/FileLists.cs
+++ b/PicView/FileHandling/FileLists.cs
@@ -66,8 +66,8 @@ internal static List<string> FileList(string path, SortFilesBy sortFilesBy)
                 return null;
             }
 
-            // TODO make search option a user setting
-            var items = Directory.EnumerateFiles(path, "*.*", SearchOption.AllDirectories)
+            var searchOption = Properties.Settings.Default.IncludeSubDirectories;
+            var items = Directory.EnumerateFiles(path, "*.*", searchOption ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly)
                 .AsParallel()
                 .Where(file =>
 
diff --git a/PicView/Properties/Settings.Designer.cs b/PicView/Properties/Settings.Designer.cs
index e81e21c6..cf892cd2 100644
--- a/PicView/Properties/Settings.Designer.cs
+++ b/PicView/Properties/Settings.Designer.cs
@@ -526,5 +526,17 @@ public bool Fullscreen {
                 this["MagentaAlpha"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("False")]
+        public bool IncludeSubDirectories {
+            get {
+                return ((bool)(this["IncludeSubDirectories"]));
+            }
+            set {
+                this["IncludeSubDirectories"] = value;
+            }
+        }
     }
 }
diff --git a/PicView/Properties/Settings.settings b/PicView/Properties/Settings.settings
index 5e1fed11..86fba1c9 100644
--- a/PicView/Properties/Settings.settings
+++ b/PicView/Properties/Settings.settings
@@ -128,5 +128,8 @@
     <Setting Name="MagentaAlpha" Type="System.Windows.Media.Color" Scope="User">
       <Value Profile="(Default)">#F2FF6CD4</Value>
     </Setting>
+    <Setting Name="IncludeSubDirectories" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/PicView/UI/Windows/SettingsWindow.xaml b/PicView/UI/Windows/SettingsWindow.xaml
index 3ca9c535..c51d1fa7 100644
--- a/PicView/UI/Windows/SettingsWindow.xaml
+++ b/PicView/UI/Windows/SettingsWindow.xaml
@@ -217,15 +217,15 @@
                         VerticalAlignment="Top"
                         Orientation="Horizontal">
                         <CheckBox
-                            x:Name="LoopRadio"
-                            Width="131"
+                            x:Name="SubDirRadio"
+                            Width="225"
                             Height="40"
                             Margin="5,3"
                             BorderThickness="2"
-                            Content="Enable Looping"
+                            Content="Enable Subdirectory Searching"
                             Style="{StaticResource Checkstyle}">
                             <CheckBox.Background>
-                                <SolidColorBrush x:Name="LoopBrush" Color="{StaticResource BackgroundColorAlt}" />
+                                <SolidColorBrush x:Name="SubDirBrush" Color="{StaticResource BackgroundColorAlt}" />
                             </CheckBox.Background>
                         </CheckBox>
                         <CheckBox
diff --git a/PicView/UI/Windows/SettingsWindow.xaml.cs b/PicView/UI/Windows/SettingsWindow.xaml.cs
index 92068a6d..6a7efe70 100644
--- a/PicView/UI/Windows/SettingsWindow.xaml.cs
+++ b/PicView/UI/Windows/SettingsWindow.xaml.cs
@@ -1,4 +1,5 @@
-using PicView.UI.Animations;
+using PicView.ChangeImage;
+using PicView.UI.Animations;
 using System;
 using System.Windows;
 using System.Windows.Input;
@@ -150,12 +151,15 @@ public SettingsWindow()
                 GreyRadio.MouseLeave += GreyRadio_MouseLeave;
                 GreyRadio.Click += Grey;
 
-                // LoopRadio
-                LoopRadio.PreviewMouseLeftButtonDown += LoopRadio_PreviewMouseLeftButtonDown;
-                LoopRadio.MouseEnter += LoopRadio_MouseEnter;
-                LoopRadio.MouseLeave += LoopRadio_MouseLeave;
-                LoopRadio.IsChecked = Properties.Settings.Default.Looping;
-                LoopRadio.Click += UpdateUIValues.SetLooping;
+                // SubDirRadio
+                SubDirRadio.PreviewMouseLeftButtonDown += SubDirRadio_PreviewMouseLeftButtonDown;
+                SubDirRadio.MouseEnter += SubDirRadio_MouseEnter;
+                SubDirRadio.MouseLeave += SubDirRadio_MouseLeave;
+                SubDirRadio.IsChecked = Properties.Settings.Default.IncludeSubDirectories;
+                SubDirRadio.Click += delegate { 
+                    Properties.Settings.Default.IncludeSubDirectories = !Properties.Settings.Default.IncludeSubDirectories;
+                    Error_Handling.Reload();
+                };
 
                 // BorderColorRadio
                 BorderRadio.PreviewMouseLeftButtonDown += BorderRadio_PreviewMouseLeftButtonDown;
@@ -625,34 +629,34 @@ private void GreyRadio_PreviewMouseLeftButtonDown(object sender, MouseButtonEven
             AnimationHelper.PreviewMouseLeftButtonDownColorEvent(GreyBrush, 12);
         }
 
-        // Loop
-        private void LoopRadio_MouseLeave(object sender, MouseEventArgs e)
+        // SubDirRadio
+        private void SubDirRadio_MouseLeave(object sender, MouseEventArgs e)
         {
             AnimationHelper.MouseLeaveColorEvent(
                 backgroundBorderColor.A,
                 backgroundBorderColor.R,
                 backgroundBorderColor.G,
                 backgroundBorderColor.B,
-                LoopBrush,
+                SubDirBrush,
                 false
             );
         }
 
-        private void LoopRadio_MouseEnter(object sender, MouseEventArgs e)
+        private void SubDirRadio_MouseEnter(object sender, MouseEventArgs e)
         {
             AnimationHelper.MouseOverColorEvent(
                 backgroundBorderColor.A,
                 backgroundBorderColor.R,
                 backgroundBorderColor.G,
                 backgroundBorderColor.B,
-                LoopBrush,
+                SubDirBrush,
                 false
             );
         }
 
-        private void LoopRadio_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        private void SubDirRadio_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            AnimationHelper.MouseLeaveColorEvent(0, 0, 0, 0, LoopBrush, false);
+            AnimationHelper.MouseLeaveColorEvent(0, 0, 0, 0, SubDirBrush, false);
         }
 
         // BorderColor
@@ -722,7 +726,7 @@ private static void Red(object sender, RoutedEventArgs e)
         private static void Teal(object sender, RoutedEventArgs e)
         {
             Properties.Settings.Default.ColorTheme = 6;
-            ConfigColors.UpdateColor();
+            UpdateColor();
         }
 
         private static void Aqua(object sender, RoutedEventArgs e)