diff --git a/app/config/config.cpp b/app/config/config.cpp
index 3228e057c..28e9cfbec 100644
--- a/app/config/config.cpp
+++ b/app/config/config.cpp
@@ -52,6 +52,7 @@ void Config::SetDefaults()
   config_map_["TimecodeDisplay"] = olive::kTimecodeFrames;
   config_map_["DefaultStillLength"] = QVariant::fromValue(rational(2));
   config_map_["HoverFocus"] = false;
+  config_map_["AudioScrubbing"] = true;
 }
 
 void Config::Load()
diff --git a/app/core.cpp b/app/core.cpp
index 18b077042..62ed05fd6 100644
--- a/app/core.cpp
+++ b/app/core.cpp
@@ -110,6 +110,9 @@ void Core::Start()
 
 void Core::Stop()
 {
+  // Save Config
+  //Config::Save();
+
   AudioManager::DestroyInstance();
 
   ColorManager::DestroyInstance();