diff --git a/gtk2_ardour/tracks_control_panel.logic.cc b/gtk2_ardour/tracks_control_panel.logic.cc
index 0342e8bbe0..8a66e2cf06 100644
--- a/gtk2_ardour/tracks_control_panel.logic.cc
+++ b/gtk2_ardour/tracks_control_panel.logic.cc
@@ -987,40 +987,28 @@ void TracksControlPanel::display_general_preferences ()
 	long period = Config->get_audio_capture_buffer_seconds ();
 	selected_item = 0;
 
-	if (period <= 0.1) {
+    if ((period <= 5.1)) {
 		selected_item = 0;
-	} else if ((period <= 5.1)) {
-		selected_item = 1;
 	} else if ((period <= 10.1)) {
-		selected_item = 2;
+		selected_item = 1;
 	} else if ((period <= 15.1)) {
-		selected_item = 3;
+		selected_item = 2;
 	} else if ((period <= 30.1)) {
-		selected_item = 4;
-	} else if ((period <= 45.1)) {
-		selected_item = 5;
-	} else if ((period <= 60.1)) {
-		selected_item = 6;
-	}
+		selected_item = 3;
+    }
 	_recording_seconds_dropdown.set_current_item (selected_item);
 	
 	period = Config->get_audio_playback_buffer_seconds ();
 	selected_item = 0;
 
-	if (period <= 0.1) {
+    if ((period <= 5.1)) {
 		selected_item = 0;
-	} else if ((period <= 5.1)) {
-		selected_item = 1;
 	} else if ((period <= 10.1)) {
-		selected_item = 2;
+		selected_item = 1;
 	} else if ((period <= 15.1)) {
+		selected_item = 2;
+	} else if ((period <= 20.1)) {
 		selected_item = 3;
-	} else if ((period <= 30.1)) {
-		selected_item = 4;
-	} else if ((period <= 45.1)) {
-		selected_item = 5;
-	} else if ((period <= 60.1)) {
-		selected_item = 6;
 	}
 	_playback_seconds_dropdown.set_current_item (selected_item);
 
@@ -1140,7 +1128,7 @@ void TracksControlPanel::on_engine_dropdown_item_clicked (WavesDropdown*, int)
 
 void
 TracksControlPanel::on_device_dropdown_item_clicked (WavesDropdown*, int)
-{
+{	
 	if (_ignore_changes) {
 		return;
 	}
diff --git a/gtk2_ardour/ui/tracks_preferences.xml b/gtk2_ardour/ui/tracks_preferences.xml
index be061a58e3..d51a747f9b 100644
--- a/gtk2_ardour/ui/tracks_preferences.xml
+++ b/gtk2_ardour/ui/tracks_preferences.xml
@@ -918,27 +918,18 @@
                        width="117"/>
               </HBox>
               <DropdownMenu style="generic_dropdown_menu">
-                <DropdownItem title="0"
-                              horzalignment="start"
-                              data="0"/>
                 <DropdownItem title="5"
                               horzalignment="start"
-                              data="1"/>
+                              data="0"/>
                 <DropdownItem title="10"
                               horzalignment="start"
-                              data="2"/>
+                              data="1"/>
                 <DropdownItem title="15"
+                              horzalignment="start"
+                              data="2"/>
+                <DropdownItem title="20"
                               horzalignment="start"
                               data="3"/>
-                <DropdownItem title="30"
-                              horzalignment="start"
-                              data="4"/>
-                <DropdownItem title="45"
-                              horzalignment="start"
-                              data="5"/>
-                <DropdownItem title="60"
-                              horzalignment="start"
-                              data="6"/>
               </DropdownMenu>
             </Dropdown>
           </HBox>
@@ -955,27 +946,18 @@
                        width="117"/>
               </HBox>
               <DropdownMenu style="generic_dropdown_menu">
-                <DropdownItem title="0"
-                              horzalignment="start"
-                              data="0"/>
                 <DropdownItem title="5"
                               horzalignment="start"
-                              data="1"/>
+                              data="0"/>
                 <DropdownItem title="10"
                               horzalignment="start"
-                              data="2"/>
+                              data="1"/>
                 <DropdownItem title="15"
+                              horzalignment="start"
+                              data="2"/>
+                <DropdownItem title="20"
                               horzalignment="start"
                               data="3"/>
-                <DropdownItem title="30"
-                              horzalignment="start"
-                              data="4"/>
-                <DropdownItem title="45"
-                              horzalignment="start"
-                              data="5"/>
-                <DropdownItem title="60"
-                              horzalignment="start"
-                              data="6"/>
               </DropdownMenu>
             </Dropdown>
           </HBox>