diff --git a/js/jquery.mobile.forms.select.js b/js/jquery.mobile.forms.select.js
index 1e4ef093..c91ff24f 100644
--- a/js/jquery.mobile.forms.select.js
+++ b/js/jquery.mobile.forms.select.js
@@ -554,6 +554,10 @@ $.widget( "mobile.selectmenu", $.mobile.widget, {
 		}
 
 		if(self.menuType == "page"){
+			// button refocus ensures proper height calculation
+			// by removing the inline style and ensuring page inclusion
+			self.menuPage.one("pagehide", focusButton);
+
 			// doesn't solve the possible issue with calling change page
 			// where the objects don't define data urls which prevents dialog key
 			// stripping - changePage has incoming refactor
diff --git a/tests/unit/core/core_scroll.js b/tests/unit/core/core_scroll.js
index 23069a09..5dad343a 100644
--- a/tests/unit/core/core_scroll.js
+++ b/tests/unit/core/core_scroll.js
@@ -50,7 +50,7 @@
 		setTimeout(function(){
 			ok($(window).scrollTop() != 0, "scrolltop position should not be zero");
 			start();
-		}, scrollTimeout - 2);
+		}, scrollTimeout - 5);
 	});
 
 	asyncTest( "scrolling marks scrollstart as disabled for 150 ms", function(){
diff --git a/tests/unit/navigation/navigation_core.js b/tests/unit/navigation/navigation_core.js
index a97bf3c2..3e8901e8 100644
--- a/tests/unit/navigation/navigation_core.js
+++ b/tests/unit/navigation/navigation_core.js
@@ -426,6 +426,6 @@
 				same(location.hash, firstDialogHash, "additional dialog hash key not added");
 				start();
 			}
-], 1000);
+		], 1000);
 	});
 })(jQuery);
diff --git a/tests/unit/select/index.html b/tests/unit/select/index.html
index 1ddb9a83..2a9e8c37 100644
--- a/tests/unit/select/index.html
+++ b/tests/unit/select/index.html
@@ -165,6 +165,62 @@
 		</select>
 	</div>
 
+	<div data-nstest-role="fieldcontain" id="select-choice-many-container-many-clicks">
+		<label for="select-choice-many-many-clicks" class="select">Your state:</label>
+		<select name="select-choice-many-many-clicks" id="select-choice-many-many-clicks">
+			<option value="AL">Alabama</option>
+			<option value="AK">Alaska</option>
+			<option value="AZ">Arizona</option>
+			<option value="AR">Arkansas</option>
+			<option value="CA">California</option>
+			<option value="CO">Colorado</option>
+			<option value="CT">Connecticut</option>
+			<option value="DE">Delaware</option>
+			<option value="FL">Florida</option>
+			<option value="GA">Georgia</option>
+			<option value="HI">Hawaii</option>
+			<option value="ID">Idaho</option>
+			<option value="IL">Illinois</option>
+			<option value="IN">Indiana</option>
+			<option value="IA">Iowa</option>
+			<option value="KS">Kansas</option>
+			<option value="KY">Kentucky</option>
+			<option value="LA">Louisiana</option>
+			<option value="ME">Maine</option>
+			<option value="MD">Maryland</option>
+			<option value="MA">Massachusetts</option>
+			<option value="MI">Michigan</option>
+			<option value="MN">Minnesota</option>
+			<option value="MS">Mississippi</option>
+			<option value="MO">Missouri</option>
+			<option value="MT">Montana</option>
+			<option value="NE">Nebraska</option>
+			<option value="NV">Nevada</option>
+			<option value="NH">New Hampshire</option>
+			<option value="NJ">New Jersey</option>
+			<option value="NM">New Mexico</option>
+			<option value="NY">New York</option>
+			<option value="NC">North Carolina</option>
+			<option value="ND">North Dakota</option>
+			<option value="OH">Ohio</option>
+			<option value="OK">Oklahoma</option>
+			<option value="OR">Oregon</option>
+			<option value="PA">Pennsylvania</option>
+			<option value="RI">Rhode Island</option>
+			<option value="SC">South Carolina</option>
+			<option value="SD">South Dakota</option>
+			<option value="TN">Tennessee</option>
+			<option value="TX">Texas</option>
+			<option value="UT">Utah</option>
+			<option value="VT">Vermont</option>
+			<option value="VA">Virginia</option>
+			<option value="WA">Washington</option>
+			<option value="WV">West Virginia</option>
+			<option value="WI">Wisconsin</option>
+			<option value="WY">Wyoming</option>
+		</select>
+	</div>
+
 	<div data-nstest-role="fieldcontain" id="select-offscreen-container">
 		<style>
 			/* keep the select small and close to the screen border to test rendering */
diff --git a/tests/unit/select/select_core.js b/tests/unit/select/select_core.js
index 138c4e80..cc9d02c4 100644
--- a/tests/unit/select/select_core.js
+++ b/tests/unit/select/select_core.js
@@ -13,6 +13,37 @@
 		teardown: function(){ location.hash = ""; }
 	});
 
+	asyncTest( "a large select menu should come up in a dialog many times", function(){
+		var menu, select = $("#select-choice-many-container a");
+
+		$.testHelper.sequence([
+			function(){
+				// bring up the dialog
+				select.trigger("click");
+			},
+
+			function(){
+				menu = $("#select-choice-many-menu");
+				same(menu.parents('.ui-dialog').length, 1);
+			},
+
+			function(){
+				// select and close the dialog
+				menu.parents('ui-dialog').find("span.ui-icon-delete").click();
+			},
+
+			function(){
+				//bring up the dialog again
+				select.trigger("click");
+			},
+
+			function(){
+				same(menu.parents('.ui-dialog').length, 1);
+				start();
+			}
+		], 500);
+	});
+
 	asyncTest( "custom select menu always renders screen from the left", function(){
 		expect( 1 );
 		var select = $("ul#select-offscreen-menu");
@@ -44,4 +75,24 @@
 			}
 		], 500);
 	});
+
+	asyncTest( "dialog sized select menu opened many times remains a dialog", function(){
+		var dialogHashKey = "ui-state=dialog",
+
+				openDialogSequence = [
+					function(){
+						$("#select-choice-many-container-many-clicks a").trigger("vclick");
+					},
+
+					function(){
+						ok(location.hash.indexOf(dialogHashKey) > -1, "hash should have the dialog hash key");
+						$(".ui-page-active li").trigger("click");
+					}
+				],
+
+				sequence = openDialogSequence.concat(openDialogSequence).concat([start]);
+
+		$.testHelper.sequence(sequence, 1000);
+	});
+
 })(jQuery);
diff --git a/tests/unit/select/select_events.js b/tests/unit/select/select_events.js
index 588eded8..344b1245 100644
--- a/tests/unit/select/select_events.js
+++ b/tests/unit/select/select_events.js
@@ -13,37 +13,6 @@
 		teardown: function(){ location.hash = ""; }
 	});
 
-	asyncTest( "a large select menu should come up in a dialog many times", function(){
-		var menu, select = $("#select-choice-many-container a");
-
-		$.testHelper.sequence([
-			function(){
-				// bring up the dialog
-				select.trigger("click");
-			},
-
-			function(){
-				menu = $("#select-choice-many-menu");
-				same(menu.parents('.ui-dialog').length, 1);
-			},
-
-			function(){
-				// select and close the dialog
-				menu.parents('ui-dialog').find("span.ui-icon-delete").click();
-			},
-
-			function(){
-				//bring up the dialog again
-				select.trigger("click");
-			},
-
-			function(){
-				same(menu.parents('.ui-dialog').length, 1);
-				start();
-			}
-		], 500);
-	});
-
 	asyncTest( "firing a click at least 400 ms later on the select screen overlay does close it", function(){
 		$.Event.prototype.originalEvent = {
 			touches: [ 'foo' ]