diff --git a/app/coffeescripts/behaviors/quiz_selectmenu.coffee b/app/coffeescripts/behaviors/quiz_selectmenu.coffee
new file mode 100644
index 00000000000..9ee52b5760f
--- /dev/null
+++ b/app/coffeescripts/behaviors/quiz_selectmenu.coffee
@@ -0,0 +1,19 @@
+define [
+  'jquery'
+  'vendor/ui.selectmenu'
+], ($) ->
+  $ ->
+    # css tweaks to ensure that it's sufficiently wide so the text doesn't
+    # get clipped unnecessarily when we make it a selectmenu. we do this here
+    # rather than in the css so as to avoid a flash of ugly content
+    #
+    # TODO: support HTML answers in dropdowns. to do this, we'll just need to
+    #  1. get rid of the escapeHTML: true (default is false)
+    #  2. in the views, double-escape any non-html answers going into dropdown
+    #     options (yes, really ... escapeHTML should more accurately be named
+    #     dontUnescapeAlreadyEscapedHTML)
+    $('.question select').css
+      '-webkit-appearance': 'none'
+      'font-size': '100%'
+      'padding-right': '40px'
+    .selectmenu escapeHtml: true
diff --git a/app/stylesheets/quizzes.sass b/app/stylesheets/quizzes.sass
index aa0acebd922..f5457b854d4 100644
--- a/app/stylesheets/quizzes.sass
+++ b/app/stylesheets/quizzes.sass
@@ -1,7 +1,7 @@
 @import environment.sass
 
-fieldset.question, fieldset.display_question
-  padding: 0
+div.question
+  border-radius: 3px
 
 #sort_questions
   :max-height 250px
@@ -852,3 +852,14 @@ ul#quiz_versions
   +border-radius(5px)
   padding: 16px
   text-shadow: 1px 1px 1px rgba(255, 255, 255, 0.75)
+
+.ui-selectmenu-menu a, .ui-selectmenu
+  color: #222 !important
+  font-weight: normal
+  text-decoration: none !important
+
+.ui-selectmenu
+  max-width: 100% !important
+
+.question select
+  max-width: 100%
diff --git a/app/views/quizzes/_display_question.html.erb b/app/views/quizzes/_display_question.html.erb
index 3283967f39f..6767b755228 100644
--- a/app/views/quizzes/_display_question.html.erb
+++ b/app/views/quizzes/_display_question.html.erb
@@ -19,14 +19,14 @@
 <div class="question_holder <%= "group" if in_group %>" id="<%= "question_template" unless question %>" style="<%= hidden unless question %>">
   <div style="display: block; height: 1px; overflow: hidden;">&nbsp;</div>
   <a name="question_<%= hash_get(question, :id, "blank") %>"></a>
-  <fieldset class="display_question question <%= question_type.question_type %> <%= "marked" if assessing && @stored_params && @stored_params["question_#{hash_get(question, :id)}_marked"] %> <%= "correct" if user_answer && hash_get(user_answer, :correct) == true %> <%= "incorrect" if user_answer && hash_get(user_answer, :correct) == false %>" id="question_<%= hash_get(question, :id, "new") %>">
+  <div class="display_question question <%= question_type.question_type %> <%= "marked" if assessing && @stored_params && @stored_params["question_#{hash_get(question, :id)}_marked"] %> <%= "correct" if user_answer && hash_get(user_answer, :correct) == true %> <%= "incorrect" if user_answer && hash_get(user_answer, :correct) == false %>" id="question_<%= hash_get(question, :id, "new") %>">
     <div class="move"><%= image_tag "move.png", :class => "move_icon" %></div>
     <% if assessing %>
       <div class="flag_question">
         <%= image_tag "flag_question.png", :title => t('titles.mark_to_revisit', "Mark this question to come back to later"), :class => "flag_icon" %>
       </div>
     <% end %>
-    <legend class="header" <%= hidden(true) if (assessing || assessment_results) && question_type && question_type.entry_type == "none" %>>
+    <div class="header" <%= hidden(true) if (assessing || assessment_results) && question_type && question_type.entry_type == "none" %>>
       <span class="name question_name"><%= hash_get(question, :question_name) %></span>:
       <span class="question_points_holder" style="<%= hidden if question_type && question_type.entry_type == "none" %>">
         <%= t(:points_possible, "%{points_possible} pts", :points_possible => raw("<span class=\"points question_points\">#{hash_get(question, :points_possible, "0")}</span>")) %>
@@ -36,7 +36,7 @@
       <% else %> 
         <a class='ui-helper-hidden-accessible' href="#question_<%= hash_get(question, :id, "new") %>_question_text"><%= t(:skip_question_text, "Skip to question text.") %></a>
       <% end %>
-    </legend>
+    </div>
     <div class="links" style="<%= hidden if user_answer || assessing %>">
       <a href="#" class="edit_question_link no-hover" title="<%= t 'links.edit_question', 'Edit this Question' %>"><%= image_tag "edit.png" %></a>
       <a href="#" class="delete_question_link no-hover" title="<%= t 'links.delete_question', 'Delete this Question' %>"><%= image_tag "delete.png" %></a>
@@ -339,5 +339,5 @@
       </div>
     <% end %>
     <div class="clear"></div>
-  </fieldset>
+  </div>
 </div>
diff --git a/app/views/quizzes/_quiz_submission.html.erb b/app/views/quizzes/_quiz_submission.html.erb
index bc3a23d9579..165edc5607d 100644
--- a/app/views/quizzes/_quiz_submission.html.erb
+++ b/app/views/quizzes/_quiz_submission.html.erb
@@ -85,7 +85,8 @@
 <script>
 require([
   'i18nObj' /* I18n.t */,
-  'jquery' /* $ */
+  'jquery' /* $ */,
+  'compiled/behaviors/quiz_selectmenu'
 ], function(I18n, $) {
 
 $(document).ready(function() {
diff --git a/app/views/quizzes/history.html.erb b/app/views/quizzes/history.html.erb
index b5d87258af3..204bb66dd0b 100644
--- a/app/views/quizzes/history.html.erb
+++ b/app/views/quizzes/history.html.erb
@@ -128,8 +128,9 @@
   require([
     'jquery' /* $ */,
     'jquery.instructure_misc_plugins' /* fragmentChange */,
-    'fragmentChangejquery.templateData' /* getTemplateData */,
-    'vendor/jquery.scrollTo' /* /\.scrollTo/ */
+    'jquery.templateData' /* getTemplateData */,
+    'vendor/jquery.scrollTo' /* /\.scrollTo/ */,
+    'compiled/behaviors/quiz_selectmenu'
   ], function($) {
 
   var data = $("#submission_details").getTemplateData({textValues: ['version_number', 'user_id']});
diff --git a/config/assets.yml b/config/assets.yml
index 841117ad738..85287e010f5 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -160,6 +160,7 @@ stylesheets:
   quizzes:
     - public/stylesheets/compiled/quizzes.css
     - public/stylesheets/compiled/message_students.css
+    - public/stylesheets/static/ui.selectmenu.css
   moderate_quiz:
     - public/stylesheets/compiled/moderate_quiz.css
   full_assignment:
diff --git a/public/javascripts/quizzes.js b/public/javascripts/quizzes.js
index cd5188ac5b2..15cde52f41e 100644
--- a/public/javascripts/quizzes.js
+++ b/public/javascripts/quizzes.js
@@ -57,7 +57,7 @@ require([
 
     // Determines whether or to show the "show question details" link.
     checkShowDetails: function() {
-      var hasQuestions = this.$questions.find('fieldset:not(.essay_question, .text_only_question)').length;
+      var hasQuestions = this.$questions.find('div.display_question:not(.essay_question, .text_only_question)').length;
       this.$showDetailsWrap[hasQuestions ? 'show' : 'hide'](200);
     },
 
diff --git a/public/javascripts/speed_grader.js b/public/javascripts/speed_grader.js
index d29ea627386..570a4771576 100644
--- a/public/javascripts/speed_grader.js
+++ b/public/javascripts/speed_grader.js
@@ -938,18 +938,16 @@ require([
 
     goToStudent: function(student_id){
       var student = $.grep(jsonData.studentsWithSubmissions, function(o){
-  	    return o.id === student_id;
-  	  })[0];
+        return o.id === student_id;
+      })[0];
 
-  	  var indexOfStudentInOptions = $selectmenu.find('option').index($selectmenu.find('option[value="' + student.id + '"]'));
-  	  if (!(indexOfStudentInOptions >= 0)) {
-  	    throw "student not found";
-  	  }
-  	  $selectmenu.selectmenu("value", indexOfStudentInOptions);
-  	  //this is lame but I have to manually tell $selectmenu to fire its 'change' event if has changed.
-  	  if (!this.currentStudent || (this.currentStudent.id != student.id)) {
-  	    $selectmenu.change();
-  	  }
+      if (student) {
+        $selectmenu.selectmenu("value", student.id);
+        //this is lame but I have to manually tell $selectmenu to fire its 'change' event if has changed.
+        if (!this.currentStudent || (this.currentStudent.id != student.id)) {
+          $selectmenu.change();
+        }
+      }
     },
 
     currentIndex: function(){
diff --git a/public/javascripts/take_quiz.js b/public/javascripts/take_quiz.js
index cac24127d4c..88d8a72b651 100644
--- a/public/javascripts/take_quiz.js
+++ b/public/javascripts/take_quiz.js
@@ -26,7 +26,8 @@ require([
   'jquery.instructure_misc_helpers' /* scrollSidebar */,
   'jquery.rails_flash_notifications' /* flashMessage */,
   'tinymce.editor_box' /* editorBox */,
-  'vendor/jquery.scrollTo' /* /\.scrollTo/ */
+  'vendor/jquery.scrollTo' /* /\.scrollTo/ */,
+  'compiled/behaviors/quiz_selectmenu'
 ], function(I18n, $, timing) {
 
   var lastAnswerSelected = null;
@@ -188,9 +189,6 @@ require([
   });
 
   $(function() {
-    // prevent mousewheel from changing answers on dropdowns see #6143
-    $('select').bind('mousewheel', false);
-
     $.scrollSidebar();
 
     if($("#preview_mode_link").length == 0) {
@@ -201,7 +199,7 @@ require([
         }
       };
       $(document).delegate('a', 'click', function(event) {
-        if($(this).closest('.ui-dialog,.mceToolbar').length > 0) { return; }
+        if($(this).closest('.ui-dialog,.mceToolbar,.ui-selectmenu').length > 0) { return; }
         if(!event.isDefaultPrevented()) {
           var url = $(this).attr('href') || "";
           var hashStripped = location.href;
@@ -258,33 +256,6 @@ require([
       }
     });
 
-    /* the intent of this is to ensure that the class doesn't ever change while
-       the dropdown is open. in windows chrome, mouseleave events still fire
-       for ancestors when a dropdown is open, and any style changes to them
-       cause the dropdown to jump/reset. this effectively normalizes the
-       mouseenter/mouseleave behavior across platforms and browsers, but the
-       side effect is that the hover class is retained until the mouse has left
-       and the select has blurred. */
-    $questions.find('.question').bind({
-      mouseenter: function(event) {
-        var $container = $(this);
-        var $activeSelect = $container.find($(document.activeElement)).filter("select");
-        if ($activeSelect.length) $activeSelect.unbind('blur.unhoverQuestion');
-        if (!$container.hasClass('hover')) $container.addClass('hover');
-      },
-      mouseleave: function(event) {
-        var $container = $(this);
-        var $activeSelect = $container.find($(document.activeElement)).filter("select");
-        if ($activeSelect.length) {
-          $activeSelect.one('blur.unhoverQuestion', function() {
-            $(this).closest('.question').trigger('mouseleave');
-          });
-        } else {
-          $container.removeClass('hover');
-        }
-      }
-    });
-
     $questions
       .delegate(":checkbox,:radio,label", 'change mouseup', function(event) {
         var $answer = $(this).parents(".answer");
diff --git a/public/javascripts/vendor/ui.selectmenu.js b/public/javascripts/vendor/ui.selectmenu.js
index d7036aee288..51a93b9b343 100755
--- a/public/javascripts/vendor/ui.selectmenu.js
+++ b/public/javascripts/vendor/ui.selectmenu.js
@@ -1,11 +1,12 @@
  /*
- * jQuery UI selectmenu
+ * jQuery UI selectmenu dev version
  *
  * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
  * Dual licensed under the MIT (MIT-LICENSE.txt)
  * and GPL (GPL-LICENSE.txt) licenses.
  *
  * http://docs.jquery.com/UI
+ * https://github.com/fnagel/jquery-ui/wiki/Selectmenu
  */
 
 require([
@@ -16,517 +17,867 @@ require([
 ], function($) {
 
 $.widget("ui.selectmenu", {
-	_init: function() {
+	getter: "value",
+	version: "1.9",
+	eventPrefix: "selectmenu",
+	options: {
+		transferClasses: true,
+		appendTo: "body",
+		typeAhead: 1000,
+		style: 'dropdown',
+		positionOptions: {
+			my: "left top",
+			at: "left bottom",
+			offset: null
+		},
+		width: null,
+		menuWidth: null,
+		handleWidth: 26,
+		maxHeight: null,
+		icons: null,
+		format: null,
+		escapeHtml: false,
+		bgImage: function() {}
+	},
+
+	_create: function() {
 		var self = this, o = this.options;
+
+		// set a default id value, generate a new random one if not set by developer
+		var selectmenuId = (this.element.attr( 'id' ) || 'ui-selectmenu-' + Math.random().toString( 16 ).slice( 2, 10 )).replace(':', '\\:');
 		
-		//quick array of button and menu id's
-		var num = Math.round(Math.random() * 1000);
-		this.ids = [this.element.attr('id') + '_' + 'button' + '_' + num, this.element.attr('id') + '_' + 'menu' + '_' + num];
-		
-		//define safe mouseup for future toggling
+		// quick array of button and menu id's
+		this.ids = [ selectmenuId, selectmenuId + '-button', selectmenuId + '-menu' ];
+
+		// define safe mouseup for future toggling
 		this._safemouseup = true;
-		
-		//create menu button wrapper
-		this.newelement = $('<a class="'+ this.widgetBaseClass +' ui-widget ui-state-default ui-corner-all" id="'+this.ids[0]+'" role="button" href="#" aria-haspopup="true" aria-owns="'+this.ids[1]+'"></a>')
-			.insertAfter(this.element);
-		
-		//transfer tabindex
-		var tabindex = this.element.attr('tabindex');
-		if(tabindex){ this.newelement.attr('tabindex', tabindex); }
-		
-		//save reference to select in data for ease in calling methods
-		this.newelement.data('selectelement', this.element);
-		
-		//menu icon
-		this.selectmenuIcon = $('<span class="'+ this.widgetBaseClass +'-icon ui-icon"></span>')
-			.prependTo(this.newelement)
-			.addClass( (o.style == "popup")? 'ui-icon-triangle-2-n-s' : 'ui-icon-triangle-1-s' );	
+		this.isOpen = false;
 
-			
-		//make associated form label trigger focus
-		$('label[for='+this.element.attr('id')+']')
-			.attr('for', this.ids[0])
-			.bind('click', function(){
+		// create menu button wrapper
+		this.newelement = $( '<a />', {
+			'class': this.widgetBaseClass + ' ui-widget ui-state-default ui-corner-all',
+			'id' : this.ids[ 1 ],
+			'role': 'button',
+			'href': '#nogo',
+			'tabindex': this.element.attr( 'disabled' ) ? 1 : 0,
+			'aria-haspopup': true,
+			'aria-owns': this.ids[ 2 ]
+		});
+		this.newelementWrap = $( "<span />" )
+			.append( this.newelement )
+			.insertAfter( this.element );
+		
+		// transfer tabindex
+		var tabindex = this.element.attr( 'tabindex' );
+		if ( tabindex ) {
+			this.newelement.attr( 'tabindex', tabindex );
+		}
+
+		// save reference to select in data for ease in calling methods
+		this.newelement.data( 'selectelement', this.element );
+
+		// menu icon
+		this.selectmenuIcon = $( '<span class="' + this.widgetBaseClass + '-icon ui-icon"></span>' )
+			.prependTo( this.newelement );
+
+		// append status span to button
+		this.newelement.prepend( '<span class="' + self.widgetBaseClass + '-status" />' );
+
+		// make associated form label trigger focus
+		this.element.bind({
+			'click.selectmenu':  function( event ) {
 				self.newelement.focus();
-				return false;
-			});	
-
-		//click toggle for menu visibility
+				event.preventDefault();
+			}
+		});
+		
+		// click toggle for menu visibility
 		this.newelement
-			.bind('mousedown', function(event){
-				self._toggle(event);
-				//make sure a click won't open/close instantly
-				if(o.style == "popup"){
+			.bind('mousedown.selectmenu', function(event) {
+				self._toggle(event, true);
+				// make sure a click won't open/close instantly
+				if (o.style == "popup") {
 					self._safemouseup = false;
-					setTimeout(function(){self._safemouseup = true;}, 300);
-				}	
+					setTimeout(function() { self._safemouseup = true; }, 300);
+				}
 				return false;
 			})
-			.bind('click',function(){
+			.bind('click.selectmenu', function() {
 				return false;
 			})
-			.keydown(function(event){
-				var ret = true;
+			.bind("keydown.selectmenu", function(event) {
+				var ret = false;
 				switch (event.keyCode) {
 					case $.ui.keyCode.ENTER:
 						ret = true;
 						break;
 					case $.ui.keyCode.SPACE:
-						ret = false;
-						self._toggle(event);	
+						self._toggle(event);
 						break;
 					case $.ui.keyCode.UP:
-					case $.ui.keyCode.LEFT:
-						ret = false;
-						self._moveSelection(-1);
+						if (event.altKey) {
+							self.open(event);
+						} else {
+							self._moveSelection(-1);
+						}
 						break;
 					case $.ui.keyCode.DOWN:
+						if (event.altKey) {
+							self.open(event);
+						} else {
+							self._moveSelection(1);
+						}
+						break;
+					case $.ui.keyCode.LEFT:
+						self._moveSelection(-1);
+						break;
 					case $.ui.keyCode.RIGHT:
-						ret = false;
 						self._moveSelection(1);
-						break;	
+						break;
 					case $.ui.keyCode.TAB:
 						ret = true;
-						break;	
+						break;
+					case $.ui.keyCode.PAGE_UP:
+					case $.ui.keyCode.HOME:
+						self.index(0);
+						break;
+					case $.ui.keyCode.PAGE_DOWN:
+					case $.ui.keyCode.END:
+						self.index(self._optionLis.length);
+						break;
 					default:
-						ret = false;
-						self._typeAhead(event.keyCode, 'mouseup');
-						break;	
+						ret = true;
 				}
 				return ret;
 			})
-			.bind('mouseover focus', function(){ 
-				$(this).addClass(self.widgetBaseClass+'-focus ui-state-hover ui-state-active'); 
+			.bind('keypress.selectmenu', function(event) {
+				if (event.which > 0) {
+					self._typeAhead(event.which, 'mouseup');
+				}
+				return true;
 			})
-			.bind('focus', function(){
-			  $(this).addClass('ui-state-active');
+			.bind('mouseover.selectmenu', function() {
+				if (!o.disabled) $(this).addClass('ui-state-hover');
 			})
-			.bind('blur', function(){
-			  $(this).removeClass('ui-state-active');
+			.bind('mouseout.selectmenu', function() {
+				if (!o.disabled) $(this).removeClass('ui-state-hover');
 			})
-			.bind('mouseout blur', function(){  
-				$(this).removeClass(self.widgetBaseClass+'-focus ui-state-hover'); 
-			});
-		
-		//document click closes menu
-		$(document)
-			.mousedown(function(event){
-				self.close(event);
+			.bind('focus.selectmenu', function() {
+				if (!o.disabled) $(this).addClass('ui-state-focus');
+			})
+			.bind('blur.selectmenu', function() {
+				if (!o.disabled) $(this).removeClass('ui-state-focus');
 			});
 
-		//change event on original selectmenu
+		// document click closes menu
+		$(document).bind("mousedown.selectmenu-" + this.ids[0], function(event) {
+			if ( self.isOpen ) {
+				self.close( event );
+			}
+		});
+
+		// change event on original selectmenu
 		this.element
-			.click(function(){ this._refreshValue(); })
-			.focus(function(){ this.newelement.focus(); });
-		
-		//create menu portion, append to body
-		var cornerClass = (o.style == "dropdown")? " ui-corner-bottom" : " ui-corner-all";
-		this.list = $('<ul class="' + self.widgetBaseClass + '-menu ui-widget ui-widget-content'+cornerClass+'" aria-hidden="true" role="listbox" aria-labelledby="'+this.ids[0]+'" id="'+this.ids[1]+'"></ul>').appendTo('body');				
-		
-		//serialize selectmenu element options	
-		var selectOptionData = [];
-		this.element
-			.find('option')
-			.each(function(){
-				selectOptionData.push({
-					value: $(this).attr('value'),
-					text: self._formatText(jQuery(this).text()),
-					selected: $(this).attr('selected'),
-					classes: $(this).attr('class'),
-					parentOptGroup: $(this).parent('optgroup').attr('label')
-				});
-			});		
-				
-		//active state class is only used in popup style
-		var activeClass = (self.options.style == "popup") ? " ui-state-active" : "";
-		
-		//write li's
-		for(var i in selectOptionData){
-			var thisLi = $('<li role="presentation"><a href="#" tabindex="-1" role="option" aria-selected="false">'+ selectOptionData[i].text +'</a></li>')
-				.data('index',i)
-				.addClass(selectOptionData[i].classes)
-				.data('optionClasses', selectOptionData[i].classes|| '')
-				.mouseup(function(event){
-						if(self._safemouseup){
-							var changed = $(this).data('index') != self._selectedIndex();
-							self.value($(this).data('index'));
-							self.select(event);
-							if(changed){ self.change(event); }
-							self.close(event,true);
-						}
-					return false;
-				})
-				.click(function(){
-					return false;
-				})
-				.bind('mouseover focus', function(){ 
-					self._selectedOptionLi().addClass(activeClass); 
-					self._focusedOptionLi().removeClass(self.widgetBaseClass+'-item-focus ui-state-hover'); 
-					$(this).removeClass('ui-state-active').addClass(self.widgetBaseClass + '-item-focus ui-state-hover'); 
-				})
-				.bind('mouseout blur', function(){ 
-					if( this == self._selectedOptionLi() ){ $(this).addClass(activeClass); }
-					$(this).removeClass(self.widgetBaseClass + '-item-focus ui-state-hover'); 
-				});
-				
-			//optgroup or not...
-			if(selectOptionData[i].parentOptGroup){
-				var optGroupName = self.widgetBaseClass + '-group-' + selectOptionData[i].parentOptGroup;
-				if(this.list.find('li.' + optGroupName).size()){
-					this.list.find('li.' + optGroupName + ':last ul').append(thisLi);
+			.bind("click.selectmenu", function() {
+				self._refreshValue();
+			})
+			// FIXME: newelement can be null under unclear circumstances in IE8
+			// TODO not sure if this is still a problem (fnagel 20.03.11)
+			.bind("focus.selectmenu", function() {
+				if (self.newelement) {
+					self.newelement[0].focus();
 				}
-				else{
-					$('<li role="presentation" class="'+self.widgetBaseClass+'-group '+optGroupName+'"><span class="'+self.widgetBaseClass+'-group-label">'+selectOptionData[i].parentOptGroup+'</span><ul></ul></li>')
-						.appendTo(this.list)
-						.find('ul')
-						.append(thisLi);
-				}
-			}
-			else{
-				thisLi.appendTo(this.list);
-			}
-			
-			//this allows for using the scrollbar in an overflowed list
-			this.list.bind('mousedown mouseup', function(){return false;});
-			
-			//append icon if option is specified
-			if(o.icons){
-				for(var j in o.icons){
-					if(thisLi.is(o.icons[j].find)){
-						thisLi
-							.data('optionClasses', selectOptionData[i].classes + ' ' + self.widgetBaseClass + '-hasIcon')
-							.addClass(self.widgetBaseClass + '-hasIcon');
-						var iconClass = o.icons[j].icon || "";
-						
-						thisLi
-							.find('a:eq(0)')
-							.prepend('<span class="'+self.widgetBaseClass+'-item-icon ui-icon '+iconClass + '"></span>');
-					}
-				}
-			}
-		}	
-		
-		//add corners to top and bottom menu items
-		this.list.find('li:last').addClass("ui-corner-bottom");
-		if(o.style == 'popup'){ this.list.find('li:first').addClass("ui-corner-top"); }
-		
-		//transfer classes to selectmenu and list
-		if(o.transferClasses){
-			var transferClasses = this.element.attr('class') || ''; 
-			this.newelement.add(this.list).addClass(transferClasses);
+			});
+
+		// set width when not set via options
+		if (!o.width) {
+			o.width = this.element.outerWidth();
 		}
+		// set menu button width
+		this.newelement.width(o.width);
+
+		// hide original selectmenu element
+		this.element.hide();
+
+		// create menu portion, append to body		
+		this.list = $( '<ul />', {
+			'class': 'ui-widget ui-widget-content',
+			'aria-hidden': true,
+			'role': 'listbox',
+			'aria-labelledby': this.ids[1],
+			'id': this.ids[2]
+		});
+		this.listWrap = $( "<div />", {
+			'class': self.widgetBaseClass + '-menu'
+		}).append( this.list ).appendTo( o.appendTo );
 		
-		//original selectmenu width
-		var selectWidth = this.element.width();
-		
-		//set menu button width
-		this.newelement.width( (o.width) ? o.width : selectWidth);
-		
-		//set menu width to either menuWidth option value, width option value, or select width 
-		if(o.style == 'dropdown'){ this.list.width( (o.menuWidth) ? o.menuWidth : ((o.width) ? o.width : selectWidth)); }
-		else { this.list.width( (o.menuWidth) ? o.menuWidth : ((o.width) ? o.width - o.handleWidth : selectWidth - o.handleWidth)); }	
-		
-		//set max height from option 
-		if(o.maxHeight && o.maxHeight < this.list.height()){ this.list.height(o.maxHeight); }	
-		
-		//save reference to actionable li's (not group label li's)
-		this._optionLis = this.list.find('li:not(.'+ self.widgetBaseClass +'-group)');
-				
-		//transfer menu click to menu button
+		// transfer menu click to menu button
 		this.list
-			.keydown(function(event){
-				var ret = true;
+			.bind("keydown.selectmenu", function(event) {
+				var ret = false;
 				switch (event.keyCode) {
 					case $.ui.keyCode.UP:
-					case $.ui.keyCode.LEFT:
-						ret = false;
-						self._moveFocus(-1);
+						if (event.altKey) {
+							self.close(event, true);
+						} else {
+							self._moveFocus(-1);
+						}
 						break;
 					case $.ui.keyCode.DOWN:
+						if (event.altKey) {
+							self.close(event, true);
+						} else {
+							self._moveFocus(1);
+						}
+						break;
+					case $.ui.keyCode.LEFT:
+						self._moveFocus(-1);
+						break;
 					case $.ui.keyCode.RIGHT:
-						ret = false;
 						self._moveFocus(1);
-						break;	
+						break;
 					case $.ui.keyCode.HOME:
-						ret = false;
 						self._moveFocus(':first');
-						break;	
+						break;
 					case $.ui.keyCode.PAGE_UP:
-						ret = false;
 						self._scrollPage('up');
-						break;	
+						break;
 					case $.ui.keyCode.PAGE_DOWN:
-						ret = false;
 						self._scrollPage('down');
 						break;
 					case $.ui.keyCode.END:
-						ret = false;
 						self._moveFocus(':last');
-						break;			
+						break;
 					case $.ui.keyCode.ENTER:
 					case $.ui.keyCode.SPACE:
-						ret = false;
-						self.close(event,true);
+						self.close(event, true);
 						$(event.target).parents('li:eq(0)').trigger('mouseup');
-						break;		
+						break;
 					case $.ui.keyCode.TAB:
 						ret = true;
-						self.close(event,true);
-						break;	
+						self.close(event, true);
+						$(event.target).parents('li:eq(0)').trigger('mouseup');
+						break;
 					case $.ui.keyCode.ESCAPE:
-						ret = false;
-						self.close(event,true);
-						break;	
+						self.close(event, true);
+						break;
 					default:
-						ret = false;
-						self._typeAhead(event.keyCode,'focus');
-						break;		
+						ret = true;
 				}
 				return ret;
+			})
+			.bind('keypress.selectmenu', function(event) {
+				if (event.which > 0) {
+					self._typeAhead(event.which, 'focus');
+				}
+				return true;
+			})
+			// this allows for using the scrollbar in an overflowed list
+			.bind( 'mousedown.selectmenu mouseup.selectmenu', function() { return false; });
+
+		// needed when window is resized
+		$(window).bind( "resize.selectmenu-" + this.ids[0], $.proxy( self.close, this ) );
+	},
+
+	_init: function() {
+		var self = this, o = this.options;
+
+		// serialize selectmenu element options
+		var selectOptionData = [];
+		this.element.find('option').each(function() {
+			var opt = $(this);
+			selectOptionData.push({
+				value: opt.attr('value'),
+				text: self._formatText(opt.text()),
+				selected: opt.attr('selected'),
+				disabled: opt.attr('disabled'),
+				classes: opt.attr('class'),
+				typeahead: opt.attr('typeahead'),
+				parentOptGroup: opt.parent('optgroup'),
+				bgImage: o.bgImage.call(opt)
 			});
-			
-		//selectmenu style
-		if(o.style == 'dropdown'){
-			this.newelement
-				.addClass(self.widgetBaseClass+"-dropdown");
-			this.list
-				.addClass(self.widgetBaseClass+"-menu-dropdown");	
-		}
-		else {
-			this.newelement
-				.addClass(self.widgetBaseClass+"-popup");
-			this.list
-				.addClass(self.widgetBaseClass+"-menu-popup");	
-		}
-		
-		//append status span to button
-		this.newelement.prepend('<span class="'+self.widgetBaseClass+'-status">'+ selectOptionData[this._selectedIndex()].text +'</span>');
-		
-		//hide original selectmenu element
-		this.element.hide();
-		
-		//transfer disabled state
-		if(this.element.attr('disabled') === true){ this.disable(); }
-		
-		//update value
-		this.value(this._selectedIndex());
-	},
-	destroy: function() {
-		this.element.removeData(this.widgetName)
-			.removeClass(this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled')
-			.removeAttr('aria-disabled');
-	
-		//unbind click on label, reset its for attr
-		$('label[for='+this.newelement.attr('id')+']')
-			.attr('for',this.element.attr('id'))
-			.unbind('click');
-		this.newelement.remove();
-		this.list.remove();
-		this.element.show();	
-	},
-	_typeAhead: function(code, eventType){
-		var self = this;
-		//define self._prevChar if needed
-		if(!self._prevChar){ self._prevChar = ['',0]; }
-		var C = String.fromCharCode(code);
-		c = C.toLowerCase();
-		var focusFound = false;
-		function focusOpt(elem, ind){
-			focusFound = true;
-			$(elem).trigger(eventType);
-			self._prevChar[1] = ind;
-		}
-		this.list.find('li a').each(function(i){	
-			if(!focusFound){
-				var thisText = $(this).text();
-				if( thisText.indexOf(C) === 0 || thisText.indexOf(c) === 0){
-						if(self._prevChar[0] == C){
-							if(self._prevChar[1] < i){ focusOpt(this,i); }	
+		});
+
+		// active state class is only used in popup style
+		var activeClass = (self.options.style == "popup") ? " ui-state-active" : "";
+
+		// empty list so we can refresh the selectmenu via selectmenu()
+		this.list.html("");
+
+		// write li's
+		if (selectOptionData.length) {
+			for (var i = 0; i < selectOptionData.length; i++) {
+				var thisLiAttr = { role : 'presentation' };
+				if ( selectOptionData[ i ].disabled ) {
+					thisLiAttr[ 'class' ] = this.namespace + '-state-disabled';
+				}					
+				var thisAAttr = {
+					html: selectOptionData[i].text || '&nbsp;',
+					href : '#nogo',
+					tabindex : -1,
+					role : 'option',
+					'aria-selected' : false
+				};
+				if ( selectOptionData[ i ].disabled ) {
+					thisAAttr[ 'aria-disabled' ] = selectOptionData[ i ].disabled;
+				}
+				if ( selectOptionData[ i ].typeahead ) {
+					thisAAttr[ 'typeahead' ] = selectOptionData[ i ].typeahead;
+				}				
+				var thisA = $('<a/>', thisAAttr);
+				var thisLi = $('<li/>', thisLiAttr)	
+					.append(thisA)				
+					.data('index', i)
+					.addClass(selectOptionData[i].classes)
+					.data('optionClasses', selectOptionData[i].classes || '')
+					.bind("mouseup.selectmenu", function(event) {
+						if (self._safemouseup && !self._disabled(event.currentTarget) && !self._disabled($( event.currentTarget ).parents( "ul>li." + self.widgetBaseClass + "-group " )) ) {
+							var changed = $(this).data('index') != self._selectedIndex();
+							self.index($(this).data('index'));
+							self.select(event);
+							if (changed) {
+								self.change(event);
+							}
+							self.close(event, true);
 						}
-						else{ focusOpt(this,i); }	
+						return false;
+					})
+					.bind("click.selectmenu", function() {
+						return false;
+					})
+					.bind('mouseover.selectmenu focus.selectmenu', function(e) {
+						// no hover if diabled
+						if (!$(e.currentTarget).hasClass(self.namespace + '-state-disabled') && !$(e.currentTarget).parent("ul").parent("li").hasClass(self.namespace + '-state-disabled')) {
+							self._selectedOptionLi().addClass(activeClass);
+							self._focusedOptionLi().removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
+							$(this).removeClass('ui-state-active').addClass(self.widgetBaseClass + '-item-focus ui-state-hover');
+						}
+					})
+					.bind('mouseout.selectmenu blur.selectmenu', function() {
+						if ($(this).is(self._selectedOptionLi().selector)) {
+							$(this).addClass(activeClass);
+						}
+						$(this).removeClass(self.widgetBaseClass + '-item-focus ui-state-hover');
+					});
+
+				// optgroup or not...
+				if ( selectOptionData[i].parentOptGroup.length ) {
+					var optGroupName = self.widgetBaseClass + '-group-' + this.element.find( 'optgroup' ).index( selectOptionData[i].parentOptGroup );
+					if (this.list.find( 'li.' + optGroupName ).length ) {
+						this.list.find( 'li.' + optGroupName + ':last ul' ).append( thisLi );
+					} else {
+						$(' <li role="presentation" class="' + self.widgetBaseClass + '-group ' + optGroupName + (selectOptionData[i].parentOptGroup.attr("disabled") ? ' ' + this.namespace + '-state-disabled" aria-disabled="true"' : '"' ) + '><span class="' + self.widgetBaseClass + '-group-label">' + selectOptionData[i].parentOptGroup.attr('label') + '</span><ul></ul></li> ')
+							.appendTo( this.list )
+							.find( 'ul' )
+							.append( thisLi );
+					}
+				} else {
+					thisLi.appendTo(this.list);
+				}
+
+				// append icon if option is specified
+				if (o.icons) {
+					for (var j in o.icons) {
+						if (thisLi.is(o.icons[j].find)) {
+							thisLi
+								.data('optionClasses', selectOptionData[i].classes + ' ' + self.widgetBaseClass + '-hasIcon')
+								.addClass(self.widgetBaseClass + '-hasIcon');
+							var iconClass = o.icons[j].icon || "";
+							thisLi
+								.find('a:eq(0)')
+								.prepend('<span class="' + self.widgetBaseClass + '-item-icon ui-icon ' + iconClass + '"></span>');
+							if (selectOptionData[i].bgImage) {
+								thisLi.find('span').css('background-image', selectOptionData[i].bgImage);
+							}
+						}
+					}
 				}
 			}
-		});
-		this._prevChar[0] = C;
+		} else {
+			$('<li role="presentation"><a href="#nogo" tabindex="-1" role="option"></a></li>').appendTo(this.list);
+		}
+		// we need to set and unset the CSS classes for dropdown and popup style
+		var isDropDown = ( o.style == 'dropdown' );
+		this.newelement
+			.toggleClass( self.widgetBaseClass + '-dropdown', isDropDown )
+			.toggleClass( self.widgetBaseClass + '-popup', !isDropDown );
+		this.list
+			.toggleClass( self.widgetBaseClass + '-menu-dropdown ui-corner-bottom', isDropDown )
+			.toggleClass( self.widgetBaseClass + '-menu-popup ui-corner-all', !isDropDown )
+			// add corners to top and bottom menu items
+			.find( 'li:first' )
+			.toggleClass( 'ui-corner-top', !isDropDown )
+			.end().find( 'li:last' )
+			.addClass( 'ui-corner-bottom' );
+		this.selectmenuIcon
+			.toggleClass( 'ui-icon-triangle-1-s', isDropDown )
+			.toggleClass( 'ui-icon-triangle-2-n-s', !isDropDown );
+
+		// transfer classes to selectmenu and list
+		if ( o.transferClasses ) {
+			var transferClasses = this.element.attr( 'class' ) || '';
+			this.newelement.add( this.list ).addClass( transferClasses );
+		}
+
+		// set menu width to either menuWidth option value, width option value, or select width
+		if ( o.style == 'dropdown' ) {
+			this.list.width( o.menuWidth ? o.menuWidth : o.width );
+		} else {
+			this.list.width( o.menuWidth ? o.menuWidth : o.width - o.handleWidth );
+		}
+
+		// reset height to auto
+		this.list.css( 'height', 'auto' );
+		var listH = this.listWrap.height();
+		var winH = $( window ).height();
+		// calculate default max height		
+		var maxH = o.maxHeight ? Math.min( o.maxHeight, winH ) : winH / 3;
+		if ( listH > maxH ) this.list.height( maxH );		
+		
+		// save reference to actionable li's (not group label li's)
+		this._optionLis = this.list.find( 'li:not(.' + self.widgetBaseClass + '-group)' );
+
+		// transfer disabled state
+		if ( this.element.attr( 'disabled' ) ) {
+			this.disable();
+		} else {
+			this.enable();
+		}
+		
+		// update value
+		this.index( this._selectedIndex() );
+		
+		// set selected item so movefocus has intial state
+		this._selectedOptionLi().addClass(this.widgetBaseClass + '-item-focus');
+
+		// needed when selectmenu is placed at the very bottom / top of the page
+		clearTimeout(this.refreshTimeout);
+		this.refreshTimeout = window.setTimeout(function () {
+			self._refreshPosition();
+		}, 200);
 	},
-	_uiHash: function(){
+
+	destroy: function() {
+		this.element.removeData( this.widgetName )
+			.removeClass( this.widgetBaseClass + '-disabled' + ' ' + this.namespace + '-state-disabled' )
+			.removeAttr( 'aria-disabled' )
+			.unbind( ".selectmenu" );
+
+		$( window ).unbind( ".selectmenu-" + this.ids[0] );
+		$( document ).unbind( ".selectmenu-" + this.ids[0] );
+		
+		this.newelementWrap.remove();
+		this.listWrap.remove();
+		
+		// unbind click event and show original select
+		this.element
+			.unbind(".selectmenu")
+			.show();
+
+		// call widget destroy function
+		$.Widget.prototype.destroy.apply(this, arguments);
+	},
+
+	_typeAhead: function( code, eventType ) {
+		var self = this,
+			c = String.fromCharCode(code).toLowerCase(),
+			matchee = null,
+			nextIndex = null;
+
+		// Clear any previous timer if present
+		if ( self._typeAhead_timer ) {
+			window.clearTimeout( self._typeAhead_timer );
+			self._typeAhead_timer = undefined;
+		}
+
+		// Store the character typed
+		self._typeAhead_chars = (self._typeAhead_chars === undefined ? "" : self._typeAhead_chars).concat(c);
+
+		// Detect if we are in cyciling mode or direct selection mode
+		if ( self._typeAhead_chars.length < 2 ||
+		     (self._typeAhead_chars.substr(-2, 1) === c && self._typeAhead_cycling) ) {
+			self._typeAhead_cycling = true;
+
+			// Match only the first character and loop
+			matchee = c;
+		}
+		else {
+			// We won't be cycling anymore until the timer expires
+			self._typeAhead_cycling = false;
+
+			// Match all the characters typed
+			matchee = self._typeAhead_chars;
+		}
+
+		// We need to determine the currently active index, but it depends on
+		// the used context: if it's in the element, we want the actual
+		// selected index, if it's in the menu, just the focused one
+		// I copied this code from _moveSelection() and _moveFocus()
+		// respectively --thg2k
+		var selectedIndex = (eventType !== 'focus' ?
+			this._selectedOptionLi().data('index') :
+			this._focusedOptionLi().data('index')) || 0;
+
+		for (var i = 0; i < this._optionLis.length; i++) {
+			var thisText = this._optionLis.eq(i).text().substr(0, matchee.length).toLowerCase();
+
+			if ( thisText === matchee ) {
+				if ( self._typeAhead_cycling ) {
+					if ( nextIndex === null )
+						nextIndex = i;
+
+					if ( i > selectedIndex ) {
+						nextIndex = i;
+						break;
+					}
+				} else {
+					nextIndex = i;
+				}
+			}
+		}
+
+		if ( nextIndex !== null ) {
+			// Why using trigger() instead of a direct method to select the
+			// index? Because we don't what is the exact action to do, it
+			// depends if the user is typing on the element or on the popped
+			// up menu
+			this._optionLis.eq(nextIndex).find("a").trigger( eventType );
+		}
+
+		self._typeAhead_timer = window.setTimeout(function() {
+			self._typeAhead_timer = undefined;
+			self._typeAhead_chars = undefined;
+			self._typeAhead_cycling = undefined;
+		}, self.options.typeAhead);
+	},
+
+	// returns some usefull information, called by callbacks only
+	_uiHash: function() {
+		var index = this.index();
 		return {
-			value: this.value()
+			index: index,
+			option: $("option", this.element).get(index),
+			value: this.element[0].value
 		};
 	},
-	open: function(event){
-		var self = this;
-		this._refreshPosition();
-		this._closeOthers(event);
-		this.newelement
-			.addClass('ui-state-active');
-		
-		this.list
-			.appendTo('body')
-			.addClass(self.widgetBaseClass + '-open')
-			.attr('aria-hidden', false)
-			.find('li:not(.'+ self.widgetBaseClass +'-group):eq('+ this._selectedIndex() +') a').focus();	
-		if(this.options.style == "dropdown"){ this.newelement.removeClass('ui-corner-all').addClass('ui-corner-top'); }	
-		this._refreshPosition();
-		this._trigger("open", event, this._uiHash());
+
+	open: function(event) {
+		var self = this, o = this.options;
+		if ( self.newelement.attr("aria-disabled") != 'true' ) {
+			self._closeOthers(event);
+			self.newelement.addClass('ui-state-active');
+				
+			self.listWrap.appendTo( o.appendTo );
+			self.list.attr('aria-hidden', false);			
+			self.listWrap.addClass( self.widgetBaseClass + '-open' );
+						
+			var selected = this._selectedOptionLi();
+			if ( o.style == "dropdown" ) {
+				self.newelement.removeClass('ui-corner-all').addClass('ui-corner-top');
+			} else {				
+				// center overflow and avoid flickering
+				this.list
+					.css("left", -5000)
+					.scrollTop( this.list.scrollTop() + selected.position().top - this.list.outerHeight()/2 + selected.outerHeight()/2 )
+					.css("left","auto");
+			}
+			
+			self._refreshPosition();	
+			
+			var link = selected.find("a");
+			if (link.length) link[0].focus();		
+			
+			self.isOpen = true;
+			self._trigger("open", event, self._uiHash());
+		}
 	},
-	close: function(event, retainFocus){
-		if(this.newelement.is('.ui-state-active')){
+
+	close: function(event, retainFocus) {
+		if ( this.newelement.is('.ui-state-active') ) {
 			this.newelement
 				.removeClass('ui-state-active');
-			this.list
-				.attr('aria-hidden', true)
-				.removeClass(this.widgetBaseClass+'-open');
-			if(this.options.style == "dropdown"){ this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all'); }
-			if(retainFocus){this.newelement.focus();}	
+			this.listWrap.removeClass(this.widgetBaseClass + '-open');
+			this.list.attr('aria-hidden', true);
+			if ( this.options.style == "dropdown" ) {
+				this.newelement.removeClass('ui-corner-top').addClass('ui-corner-all');
+			}
+			if ( retainFocus ) {
+				this.newelement.focus();
+			}
+			this.isOpen = false;
 			this._trigger("close", event, this._uiHash());
 		}
 	},
+
 	change: function(event) {
-		this.element.trigger('change');
+		this.element.trigger("change");
 		this._trigger("change", event, this._uiHash());
 	},
+
 	select: function(event) {
+		if (this._disabled(event.currentTarget)) { return false; }
 		this._trigger("select", event, this._uiHash());
 	},
-	_closeOthers: function(event){
-		$('.'+ this.widgetBaseClass +'.ui-state-active').not(this.newelement).each(function(){
-			$(this).data('selectelement').selectmenu('close',event);
+	
+	widget: function() {
+		return this.listWrap.add( this.newelementWrap );
+	},
+
+	_closeOthers: function(event) {
+		$('.' + this.widgetBaseClass + '.ui-state-active').not(this.newelement).each(function() {
+			$(this).data('selectelement').selectmenu('close', event);
 		});
-		$('.'+ this.widgetBaseClass +'.ui-state-hover').trigger('mouseout');
+		$('.' + this.widgetBaseClass + '.ui-state-hover').trigger('mouseout');
 	},
-	_toggle: function(event,retainFocus){
-		if(this.list.is('.'+ this.widgetBaseClass +'-open')){ this.close(event,retainFocus); }
-		else { this.open(event); }
+
+	_toggle: function(event, retainFocus) {
+		if ( this.isOpen ) {
+			this.close(event, retainFocus);
+		} else {
+			this.open(event);
+		}
 	},
-	_formatText: function(text){
-		return this.options.format ? this.options.format(text) : text;
+	
+	_formatText: function(text) {
+		if (this.options.format) {
+			text = this.options.format(text);
+		} else if (this.options.escapeHtml) {
+			text = $('<div />').text(text).html();
+		}
+		return text;
 	},
-	_selectedIndex: function(){
+
+	_selectedIndex: function() {
 		return this.element[0].selectedIndex;
 	},
-	_selectedOptionLi: function(){
+
+	_selectedOptionLi: function() {
 		return this._optionLis.eq(this._selectedIndex());
 	},
-	_focusedOptionLi: function(){
-		return this.list.find('.'+ this.widgetBaseClass +'-item-focus');
+
+	_focusedOptionLi: function() {
+		return this.list.find('.' + this.widgetBaseClass + '-item-focus');
 	},
-	_moveSelection: function(amt){
-		var currIndex = parseInt(this._selectedOptionLi().data('index'), 10);
-		var newIndex = currIndex + amt;
-		return this._optionLis.eq(newIndex).trigger('mouseup');
+
+	_moveSelection: function(amt, recIndex) {
+		// do nothing if disabled
+		if (!this.options.disabled) {
+			var currIndex = parseInt(this._selectedOptionLi().data('index') || 0, 10);
+			var newIndex = currIndex + amt;
+			// do not loop when using up key
+
+			if (newIndex < 0) {
+				newIndex = 0;
+			}
+			if (newIndex > this._optionLis.size() - 1) {
+				newIndex = this._optionLis.size() - 1;
+			}
+			// Occurs when a full loop has been made
+			if (newIndex === recIndex) { return false; }
+
+			if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
+				// if option at newIndex is disabled, call _moveFocus, incrementing amt by one
+				(amt > 0) ? ++amt : --amt;
+				this._moveSelection(amt, newIndex);
+			} else {
+				this._optionLis.eq(newIndex).trigger('mouseover').trigger('mouseup');
+			}
+		}
 	},
-	_moveFocus: function(amt){
-		var newIndex;
-		if(!isNaN(amt)){
-			var currIndex = parseInt(this._focusedOptionLi().data('index'), 10);
-			newIndex = currIndex + amt;
+
+	_moveFocus: function(amt, recIndex) {
+		if (!isNaN(amt)) {
+			var currIndex = parseInt(this._focusedOptionLi().data('index') || 0, 10);
+			var newIndex = currIndex + amt;
+		} else {
+			var newIndex = parseInt(this._optionLis.filter(amt).data('index'), 10);
 		}
-		else { newIndex = parseInt(this._optionLis.filter(amt).data('index'), 10); }
-		
-		if(newIndex < 0){ newIndex = 0; }
-		if(newIndex > this._optionLis.size()-1){
-			newIndex =  this._optionLis.size()-1;
+
+		if (newIndex < 0) {
+			newIndex = 0;
 		}
+		if (newIndex > this._optionLis.size() - 1) {
+			newIndex = this._optionLis.size() - 1;
+		}
+
+		//Occurs when a full loop has been made
+		if (newIndex === recIndex) { return false; }
+
 		var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
-		
-		this._focusedOptionLi().find('a:eq(0)').attr('id','').blur();
-		this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID).focus();
+
+		this._focusedOptionLi().find('a:eq(0)').attr('id', '');
+
+		if (this._optionLis.eq(newIndex).hasClass( this.namespace + '-state-disabled' )) {
+			// if option at newIndex is disabled, call _moveFocus, incrementing amt by one
+			(amt > 0) ? ++amt : --amt;
+			this._moveFocus(amt, newIndex);
+		} else {
+			this._optionLis.eq(newIndex).find('a:eq(0)').attr('id',activeID).focus();
+		}
+
 		this.list.attr('aria-activedescendant', activeID);
 	},
-	_scrollPage: function(direction){
-		var numPerPage = Math.floor(this.list.outerHeight() / this.list.find('li:first').outerHeight());
-		numPerPage = (direction == 'up') ? -numPerPage : numPerPage;
+
+	_scrollPage: function(direction) {
+		var numPerPage = Math.floor(this.list.outerHeight() / this._optionLis.first().outerHeight());
+		numPerPage = (direction == 'up' ? -numPerPage : numPerPage);
 		this._moveFocus(numPerPage);
 	},
-	_setData: function(key, value) {
+
+	_setOption: function(key, value) {
 		this.options[key] = value;
+		// set
 		if (key == 'disabled') {
+			if (value) this.close();
 			this.element
 				.add(this.newelement)
-				.add(this.list)
-					[value ? 'addClass' : 'removeClass'](
-						this.widgetBaseClass + '-disabled' + ' ' +
-						this.namespace + '-state-disabled')
-					.attr("aria-disabled", value);
+				.add(this.list)[value ? 'addClass' : 'removeClass'](
+					this.widgetBaseClass + '-disabled' + ' ' +
+					this.namespace + '-state-disabled')
+				.attr("aria-disabled", value);
 		}
 	},
+
+	disable: function(index, type){
+			// if options is not provided, call the parents disable function
+			if ( typeof( index ) == 'undefined' ) {
+				this._setOption( 'disabled', true );
+			} else {
+				if ( type == "optgroup" ) {
+					this._disableOptgroup(index);
+				} else {
+					this._disableOption(index);
+				}
+			}
+	},
+
+	enable: function(index, type) {
+			// if options is not provided, call the parents enable function
+			if ( typeof( index ) == 'undefined' ) {
+				this._setOption('disabled', false);
+			} else {
+				if ( type == "optgroup" ) {
+					this._enableOptgroup(index);
+				} else {
+					this._enableOption(index);
+				}
+			}
+	},
+
+	_disabled: function(elem) {
+			return $(elem).hasClass( this.namespace + '-state-disabled' );
+	},
+
+
+	_disableOption: function(index) {
+			var optionElem = this._optionLis.eq(index);
+			if (optionElem) {
+				optionElem.addClass(this.namespace + '-state-disabled')
+					.find("a").attr("aria-disabled", true);
+				this.element.find("option").eq(index).attr("disabled", "disabled");
+			}
+	},
+
+	_enableOption: function(index) {
+			var optionElem = this._optionLis.eq(index);
+			if (optionElem) {
+				optionElem.removeClass( this.namespace + '-state-disabled' )
+					.find("a").attr("aria-disabled", false);
+				this.element.find("option").eq(index).removeAttr("disabled");
+			}
+	},
+
+	_disableOptgroup: function(index) {
+			var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
+			if (optGroupElem) {
+				optGroupElem.addClass(this.namespace + '-state-disabled')
+					.attr("aria-disabled", true);
+				this.element.find("optgroup").eq(index).attr("disabled", "disabled");
+			}
+	},
+
+	_enableOptgroup: function(index) {
+			var optGroupElem = this.list.find( 'li.' + this.widgetBaseClass + '-group-' + index );
+			if (optGroupElem) {
+				optGroupElem.removeClass(this.namespace + '-state-disabled')
+					.attr("aria-disabled", false);
+				this.element.find("optgroup").eq(index).removeAttr("disabled");
+			}
+	},
+
+	index: function(newValue) {
+		if (arguments.length) {
+			if (!this._disabled($(this._optionLis[newValue]))) {
+				this.element[0].selectedIndex = newValue;
+				this._refreshValue();
+			} else {
+				return false;
+			}
+		} else {
+			return this._selectedIndex();
+		}
+	},
+
 	value: function(newValue) {
 		if (arguments.length) {
-			this.element[0].selectedIndex = newValue;
+			this.element[0].value = newValue;
 			this._refreshValue();
-			this._refreshPosition();
+		} else {
+			return this.element[0].value;
 		}
-		return this.element[0].selectedIndex;
 	},
+
 	_refreshValue: function() {
 		var activeClass = (this.options.style == "popup") ? " ui-state-active" : "";
 		var activeID = this.widgetBaseClass + '-item-' + Math.round(Math.random() * 1000);
-		//deselect previous
+		// deselect previous
 		this.list
-			.find('.'+ this.widgetBaseClass +'-item-selected')
+			.find('.' + this.widgetBaseClass + '-item-selected')
 			.removeClass(this.widgetBaseClass + "-item-selected" + activeClass)
 			.find('a')
 			.attr('aria-selected', 'false')
 			.attr('id', '');
-		//select new
 		this._selectedOptionLi()
-			.addClass(this.widgetBaseClass + "-item-selected"+activeClass)
+			.addClass(this.widgetBaseClass + "-item-selected" + activeClass)
 			.find('a')
 			.attr('aria-selected', 'true')
 			.attr('id', activeID);
-			
-		//toggle any class brought in from option
-		var currentOptionClasses = this.newelement.data('optionClasses') ? this.newelement.data('optionClasses') : "";
-		var newOptionClasses = this._selectedOptionLi().data('optionClasses') ? this._selectedOptionLi().data('optionClasses') : "";
+
+		// toggle any class brought in from option
+		var currentOptionClasses = (this.newelement.data('optionClasses') ? this.newelement.data('optionClasses') : "");
+		var newOptionClasses = (this._selectedOptionLi().data('optionClasses') ? this._selectedOptionLi().data('optionClasses') : "");
 		this.newelement
 			.removeClass(currentOptionClasses)
 			.data('optionClasses', newOptionClasses)
 			.addClass( newOptionClasses )
-			.find('.'+this.widgetBaseClass+'-status')
-			.html( 
+			.find('.' + this.widgetBaseClass + '-status')
+			.html(
 				this._selectedOptionLi()
 					.find('a:eq(0)')
-					.html() 
+					.html()
 			);
-			
+
 		this.list.attr('aria-activedescendant', activeID);
 	},
-	_refreshPosition: function(){	
-		//set left value
-		this.list.css('left', this.newelement.offset().left);
-		
-		//set top value
-		var menuTop = this.newelement.offset().top;
-		var scrolledAmt = this.list[0].scrollTop;
-		this.list.find('li:lt('+this._selectedIndex()+')').each(function(){
-			scrolledAmt -= $(this).outerHeight();
-		});
-		
-		if(this.newelement.is('.'+this.widgetBaseClass+'-popup')){
-			menuTop+=scrolledAmt; 
-			this.list.css('top', menuTop); 
-		}	
-		else { 
-			menuTop += this.newelement.height();
-			this.list.css('top', menuTop); 
+
+	_refreshPosition: function() {
+		var o = this.options;
+
+		// if its a pop-up we need to calculate the position of the selected li
+		if ( o.style == "popup" && !o.positionOptions.offset ) {
+			var selected = this._selectedOptionLi();
+			var _offset = "0 " + ( this.list.offset().top  - selected.offset().top - ( this.newelement.outerHeight() + selected.outerHeight() ) / 2);
 		}
-	}
-});
-
-$.extend($.ui.selectmenu, {
-	getter: "value",
-	version: "@VERSION",
-	eventPrefix: "selectmenu",
-	defaults: {
-		transferClasses: true,
-		style: 'popup', 
-		width: null, 
-		menuWidth: null, 
-		handleWidth: 26, 
-		maxHeight: null,
-		icons: null, 
-		format: null
+		this.listWrap
+			.zIndex( this.element.zIndex() + 1 )
+			.position({
+				// set options for position plugin
+				of: o.positionOptions.of || this.newelement,
+				my: o.positionOptions.my,
+				at: o.positionOptions.at,
+				offset: o.positionOptions.offset || _offset,
+				collision: o.positionOptions.collision || o.style == "popup" ? 'fit' :'flip'
+			});
 	}
 });
 
diff --git a/public/stylesheets/static/jquery-ui-theme.css b/public/stylesheets/static/jquery-ui-theme.css
index 310d18505f1..b2ad9613a04 100644
--- a/public/stylesheets/static/jquery-ui-theme.css
+++ b/public/stylesheets/static/jquery-ui-theme.css
@@ -60,7 +60,7 @@
 ----------------------------------*/
 .ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(/images/jqueryui/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #5F83B9; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #749AAF; background: #fdf5ce url(/images/jqueryui/button_bg.png) 50% 50% repeat-x; font-weight: bold; color: #1C4257; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #749AAF; background-color: #9ec8df; background-image: -webkit-gradient(linear, left top, left bottom, from(#b9e0f5), to(#83b0ca)); background-image: -webkit-linear-gradient(top, #b9e0f5, #83b0ca); background-image: -moz-linear-gradient(top, #b9e0f5, #83b0ca); background-image: -ms-linear-gradient(top, #b9e0f5, #83b0ca); background-image: -o-linear-gradient(top, #b9e0f5, #83b0ca); background-image: linear-gradient(top, #b9e0f5, #83b0ca); -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#b9e0f5',EndColorStr='#83b0ca')"; font-weight: bold; color: #1C4257; text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8); }
 .ui-state-hover a, .ui-state-hover a:hover { color: #1C4257; text-decoration: none; }
 .ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(/images/jqueryui/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
diff --git a/public/stylesheets/static/ui.selectmenu.css b/public/stylesheets/static/ui.selectmenu.css
index 3220be7c18c..d3204d7642d 100755
--- a/public/stylesheets/static/ui.selectmenu.css
+++ b/public/stylesheets/static/ui.selectmenu.css
@@ -1,29 +1,27 @@
 /* Selectmenu
 ----------------------------------*/
-.ui-selectmenu { display: block; position:relative; height:2em; text-decoration: none; overflow:hidden;}
+.ui-selectmenu { display: block; display: inline-block; position: relative; height: 2.2em; vertical-align: middle; text-decoration: none; overflow: hidden; zoom: 1; }
 .ui-selectmenu-icon { position:absolute; right:6px; margin-top:-8px; top: 50%; }
-.ui-selectmenu-menu { padding:0; margin:0; list-style:none; position:absolute; top: 0; visibility: hidden; display:none; overflow: auto;  -moz-border-radius: 0; -webkit-border-radius: 0px; border-radius: 0;}
-.ui-selectmenu-open { visibility: visible; display:block; }
+.ui-selectmenu-menu { padding:0; margin:0; position:absolute; top: 0; display: none; z-index: 1005; background: #fff} /* z-index: 1005 to make selectmenu work with dialog */
+.ui-selectmenu-menu  ul { padding:0; margin:0; list-style:none; position: relative; overflow: auto; overflow-y: auto ; overflow-x: hidden; } 
+.ui-selectmenu-open { display: block; }
 .ui-selectmenu-menu-popup { margin-top: -1px; }
-.ui-selectmenu-menu-dropdown {
-  background-color: white;
-  border-color: #B5B8C8;
-}
 .ui-selectmenu-menu li { padding:0; margin:0; display: block; border-top: 1px dotted transparent; border-bottom: 1px dotted transparent; border-right-width: 0 !important; border-left-width: 0 !important; font-weight: normal !important; }
-.ui-selectmenu-menu li a,.ui-selectmenu-status {line-height: 1em; display:block; padding:.3em 1em; outline:none; text-decoration:none; }
+.ui-selectmenu-menu li a,.ui-selectmenu-status { line-height: 1.4em; display: block; padding: .405em 2.1em .405em 1em; outline:none; text-decoration:none; }
+.ui-selectmenu-menu li.ui-state-disabled a, .ui-state-disabled { cursor: default; }
 .ui-selectmenu-menu li.ui-selectmenu-hasIcon a,
 .ui-selectmenu-hasIcon .ui-selectmenu-status { padding-left: 20px; position: relative; margin-left: 5px; }
 .ui-selectmenu-menu li .ui-icon, .ui-selectmenu-status .ui-icon { position: absolute; top: 1em; margin-top: -8px; left: 0; }
 .ui-selectmenu-status { line-height: 1.4em; }
-.ui-selectmenu-open li.ui-selectmenu-item-focus a { background-color: transparent;  }
-.ui-selectmenu-open li.ui-selectmenu-item-selected { }
-.ui-selectmenu-menu li span,.ui-selectmenu-status span { display:block; margin-bottom: 0; }
-.ui-selectmenu-menu li .ui-selectmenu-item-header {  }
-.ui-selectmenu-menu li .ui-selectmenu-item-content {  }
-.ui-selectmenu-menu li .ui-selectmenu-item-footer {
-  margin-top: -2px; 
-}
-/*for optgroups*/
+.ui-selectmenu-menu li span,.ui-selectmenu-status span { display:block; margin-bottom: .2em; }
+.ui-selectmenu-menu li .ui-selectmenu-item-header { font-weight: bold; }
+.ui-selectmenu-menu li .ui-selectmenu-item-footer { opacity: .8; }
+/* for optgroups */
 .ui-selectmenu-menu .ui-selectmenu-group { font-size: 1em; }
-.ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding:.6em .5em 0; font-weight: bold; }
-.ui-selectmenu-menu .ui-selectmenu-group ul { margin: 0; padding: 0; }
\ No newline at end of file
+.ui-selectmenu-menu .ui-selectmenu-group .ui-selectmenu-group-label { line-height: 1.4em; display:block; padding: .6em .5em 0; font-weight: bold; }
+.ui-selectmenu-menu .ui-selectmenu-group ul { margin: 0; padding: 0; }
+/* IE6 workaround (dotted transparent borders) */
+* html .ui-selectmenu-menu li { border-color: pink; filter:chroma(color=pink); width:100%; }
+* html .ui-selectmenu-menu li a { position: relative }
+/* IE7 workaround (opacity disabled) */
+*+html .ui-state-disabled, *+html .ui-state-disabled a { color: silver; }
diff --git a/spec/selenium/quizzes_questions_spec.rb b/spec/selenium/quizzes_questions_spec.rb
index 1315091313c..d95a3a6b7cf 100644
--- a/spec/selenium/quizzes_questions_spec.rb
+++ b/spec/selenium/quizzes_questions_spec.rb
@@ -266,32 +266,13 @@ describe "quizzes questions" do
       end
     end
 
-    # see blur.unhoverQuestion in take_quiz.js. avoids a windows chrome display glitch
-    it "should not unhover a question so long as one of its selects has focus" do
-      container = driver.find_element(:css, '.question')
-      driver.execute_script("$('.question').mouseenter()")
-      container.attribute(:class).should match(/hover/)
-
-      container.find_element(:css, 'select').click
-
-      driver.execute_script("$('.question').mouseleave()")
-      container.attribute(:class).should match(/hover/)
-
-      driver.execute_script("$('.question select').blur()")
-      container.attribute(:class).should_not match(/hover/)
-    end
-
-    it "should cancel mousewheel events on select elements" do
-      skip_if_ie('Out of memory')
-      driver.execute_script <<-EOF
-        window.mousewheelprevented = false;
-        jQuery('select').bind('mousewheel', function(event) {
-          mousewheelprevented = event.isDefaultPrevented();
-        }).trigger('mousewheel');
-      EOF
-
-      is_prevented = driver.execute_script('return window.mousewheelprevented')
-      is_prevented.should be_true
+    it "should selectmenu-ify select elements" do
+      select = driver.find_element(:css, '.question select')
+      keep_trying_until { !select.displayed? }
+      
+      driver.find_element(:css, 'a.ui-selectmenu').click
+      driver.find_elements(:css, '.ui-selectmenu-open li')[1].click
+      select[:selectedIndex].should eql "1"
     end
   end
 end
\ No newline at end of file