diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties
index 5726f99686fbf5b85a8390e24825dbf66b175fd3..f0592da75cbbc3f753be619049a2aee9cc03a638 100755
--- a/bigbluebutton-client/locale/en_US/bbbResources.properties
+++ b/bigbluebutton-client/locale/en_US/bbbResources.properties
@@ -503,6 +503,7 @@ bbb.polling.startButton.label = Start Poll
 bbb.polling.publishButton.label = Publish
 bbb.polling.closeButton.label = Close
 bbb.polling.pollModal.title = Live Poll Results
+bbb.polling.customChoices.title = Enter Polling Choices
 bbb.polling.respondersLabel.novotes = Waiting for responses
 bbb.polling.respondersLabel.text = {0} Users Responded
 bbb.polling.respondersLabel.finished = Done
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollChoicesModal.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollChoicesModal.mxml
index bd726873bbaed032c4089814f91332dda3ed2162..1fc81ff939c8c970b69d400dcf6de5f6d2454f09 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollChoicesModal.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollChoicesModal.mxml
@@ -21,8 +21,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:TitleWindow xmlns:fx="http://ns.adobe.com/mxml/2009" 
 				xmlns:s="library://ns.adobe.com/flex/spark" 
 				xmlns:mx="library://ns.adobe.com/flex/mx"
-				width="350"
-				layout="vertical">
+				width="350" layout="vertical"
+				show="{focusManager.setFocus(choiceFirst)}">
 	<fx:Script>
 		<![CDATA[
 			import com.asfusion.mate.events.Dispatcher;
@@ -65,36 +65,18 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	</fx:Script>
 	
 	<mx:Label id="modalTitle" styleName="micSettingsWindowTitleStyle"
-			  text="Enter Polling Choices" width="100%"/>
+			  text="{ResourceUtil.getInstance().getString('bbb.polling.customChoices.title')}" width="100%"/>
 	
 	<mx:HRule width="100%"/>
 	
-	<mx:Label text="Enter your polling choices below"/>
-	
-	<mx:HBox width="100%">
-		<mx:Label text="1"/>
+	<mx:VBox width="100%" paddingTop="20" paddingBottom="20" paddingLeft="16" paddingRight="16">
 		<mx:TextInput id="choiceFirst" width="100%"/>
-	</mx:HBox>
-	<mx:HBox width="100%">
-		<mx:Label text="2"/>
 		<mx:TextInput id="choiceSecond" width="100%"/>
-	</mx:HBox>
-	<mx:HBox width="100%">
-		<mx:Label text="3"/>
 		<mx:TextInput id="choiceThird" width="100%"/>
-	</mx:HBox>
-	<mx:HBox width="100%">
-		<mx:Label text="4"/>
 		<mx:TextInput id="choiceFourth" width="100%"/>
-	</mx:HBox>
-	<mx:HBox width="100%">
-		<mx:Label text="5"/>
 		<mx:TextInput id="choiceFifth" width="100%"/>
-	</mx:HBox>
-	<mx:HBox width="100%">
-		<mx:Label text="6"/>
 		<mx:TextInput id="choiceSixth" width="100%"/>
-	</mx:HBox>
+	</mx:VBox>
 
 	<mx:HRule width="100%"/>
 	
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
index 572c301536d8fff87b61d834b4c43c5c2c90c85a..7d6d5236614fa0a521e6f7993d6668dd86f5b1e5 100755
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
@@ -623,7 +623,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 					constructedLabel += "/" + ResourceUtil.getInstance().getString("bbb.polling.answer."+String.fromCharCode(65+i));
 					pollMenuData.push({label: constructedLabel});
 				}
-				pollMenuData.push({label: "Custom"});
+				pollMenuData.push({label: "Custom Poll..."});
 			}
 			
 			private function onPollStartButtonClicked():void {