diff --git a/public/modules/forms/views/directiveViews/field/dropdown.html b/public/modules/forms/views/directiveViews/field/dropdown.html
index b127dd07..f904fc59 100755
--- a/public/modules/forms/views/directiveViews/field/dropdown.html
+++ b/public/modules/forms/views/directiveViews/field/dropdown.html
@@ -13,13 +13,13 @@
 				ng-model-options="{ debounce: 250 }"  
 				ng-required="field.required" 
 				ng-disabled="field.disabled"
-                ng-click="$root.nextField()"
 				ng-focus="setActiveField(field._id, index, true)">
 			<ui-select-match placeholder="Type or select an option">
 				{{$select.selected.option_value}}
 			</ui-select-match>
 			<ui-select-choices repeat="option in field.fieldOptions | filter: $select.search"
-				ng-class="{'active': option.option_value === field.fieldValue }">
+				ng-click="$root.nextField()"
+                ng-class="{'active': option.option_value === field.fieldValue }">
 				<span ng-bind-html="option.option_value | highlight: $select.search"></span>
 			</ui-select-choices>
         </ui-select>    
diff --git a/public/modules/forms/views/directiveViews/field/radio.html b/public/modules/forms/views/directiveViews/field/radio.html
index eea5e616..7072f3ba 100755
--- a/public/modules/forms/views/directiveViews/field/radio.html
+++ b/public/modules/forms/views/directiveViews/field/radio.html
@@ -6,10 +6,8 @@
                     style="margin: 0.5em; padding-left:30px" 
                     ng-click="$root.nextField()"
                     ng-class="{activeBtn: field.fieldValue == field.fieldOptions[$index].option_id}">
-                <input 
-                    ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" 
-                    type="radio" 
-                    class="focusOn"
+                <input ng-style="{'color': design.colors.answerColor, 'border-color': design.colors.answerColor}" 
+                    type="radio" class="focusOn"
                     value="{{option.option_value}}" 
                     ng-model="field.fieldValue" 
                     ng-model-options="{ debounce: 250 }"