diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
index adba02d..abb38c5 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue/HeaderWidget.cs
@@ -58,6 +58,7 @@ namespace Banshee.PlayQueue
             var fill_label = new Label (Catalog.GetString ("_Fill"));
             mode_combo = new DictionaryComboBox<RandomBy> ();
             foreach (var random_by in shuffler.RandomModes.OrderBy (r => r.Adverb)) {
+                Console.WriteLine ("PlayQueue.HeaderWidget.ctor have random by {0}", random_by.Id);
                 mode_combo.Add (random_by.Adverb, random_by);
                 if (random_by.Id == "off") {
                     mode_combo.Default = random_by;
@@ -100,7 +101,7 @@ namespace Banshee.PlayQueue
             var default_randomby = shuffler.RandomModes.FirstOrDefault (r => r.Id == shuffle_mode_id);
             if (default_randomby != null) {
                 mode_combo.ActiveValue = default_randomby;
-            } else {
+            } (mode_combo.Default != null) {
                 mode_combo.ActiveValue = mode_combo.Default;
             }
 
