diff --git a/src/musikcube/app/layout/MainLayout.cpp b/src/musikcube/app/layout/MainLayout.cpp
index e747eb67c..50886decb 100755
--- a/src/musikcube/app/layout/MainLayout.cpp
+++ b/src/musikcube/app/layout/MainLayout.cpp
@@ -128,7 +128,7 @@ void MainLayout::OnLayout() {
     if (this->library->Indexer()->GetState() == IIndexer::StateIndexing) {
         size_t cx = this->GetContentWidth();
         this->SetPadding(1, 0, 0, 0);
-        this->syncing->MoveAndResize(0, 0, cx, 1);
+        this->syncing->MoveAndResize(0, 0, (int) cx, 1);
         this->syncing->Show();
 
         if (this->syncUpdateCount == 0) {
@@ -234,7 +234,7 @@ void MainLayout::OnIndexerFinished(int count) {
 }
 
 void MainLayout::OnTrackChanged(size_t index, musik::core::TrackPtr track) {
-    if (!track) {
+    if (prefs->GetBool(cube::prefs::keys::DisableWindowTitleUpdates, false) || !track) {
         App::Instance().SetTitle("musikcube");
     }
     else {
diff --git a/src/musikcube/app/layout/SettingsLayout.cpp b/src/musikcube/app/layout/SettingsLayout.cpp
index 91e854e7d..69ac102bb 100755
--- a/src/musikcube/app/layout/SettingsLayout.cpp
+++ b/src/musikcube/app/layout/SettingsLayout.cpp
@@ -118,6 +118,7 @@ static inline std::shared_ptr<ISchema> AdvancedSettingsSchema() {
 #endif
     schema->AddBool(cube::prefs::keys::AutoHideCommandBar, false);
     schema->AddBool(cube::prefs::keys::DisableRatingColumn, false);
+    schema->AddBool(cube::prefs::keys::DisableWindowTitleUpdates, false);
     schema->AddString(cube::prefs::keys::RatingPositiveChar, kFilledStar.c_str());
     schema->AddString(cube::prefs::keys::RatingNegativeChar, kEmptyStar.c_str());
     schema->AddString(core::prefs::keys::AuddioApiToken, "");
diff --git a/src/musikcube/app/util/PreferenceKeys.cpp b/src/musikcube/app/util/PreferenceKeys.cpp
index f44b64ab4..f8e6dda2c 100644
--- a/src/musikcube/app/util/PreferenceKeys.cpp
+++ b/src/musikcube/app/util/PreferenceKeys.cpp
@@ -58,6 +58,7 @@ namespace musik { namespace cube { namespace prefs {
     const std::string keys::RatingNegativeChar = "RatingNegativeChar";
     const std::string keys::AutoHideCommandBar = "AutoHideCommandBar";
     const std::string keys::DisableRatingColumn = "DisableRatingColumn";
+    const std::string keys::DisableWindowTitleUpdates = "DisableWindowTitleUpdates";
     const std::string keys::AppQuitKey = "AppQuitKey";
 
 } } }
diff --git a/src/musikcube/app/util/PreferenceKeys.h b/src/musikcube/app/util/PreferenceKeys.h
index 546baf2d1..85c4847b9 100644
--- a/src/musikcube/app/util/PreferenceKeys.h
+++ b/src/musikcube/app/util/PreferenceKeys.h
@@ -60,6 +60,7 @@ namespace musik { namespace cube { namespace prefs {
         extern const std::string RatingNegativeChar;
         extern const std::string AutoHideCommandBar;
         extern const std::string DisableRatingColumn;
+        extern const std::string DisableWindowTitleUpdates;
         extern const std::string AppQuitKey;
     }