diff --git a/basis/html/components/components.factor b/basis/html/components/components.factor
index dafc9dd06b..6f35ba5d97 100644
--- a/basis/html/components/components.factor
+++ b/basis/html/components/components.factor
@@ -83,7 +83,7 @@ TUPLE: choice size multiple choices ;
     choice new ;
 
 : render-option ( text selected? -- )
-    <option [ "true" =selected ] when option>
+    <option [ "selected" =selected ] when option>
         present escape-string write
     </option> ;
 
diff --git a/extra/webapps/pastebin/new-paste.xml b/extra/webapps/pastebin/new-paste.xml
index 6abae4895b..96339b6cf8 100644
--- a/extra/webapps/pastebin/new-paste.xml
+++ b/extra/webapps/pastebin/new-paste.xml
@@ -18,6 +18,6 @@
 			</tr>
 		</table>
 
-		<input type="SUBMIT" value="Submit" />
+		<p> <button>Submit</button> </p>
 	</t:form>
 </t:chloe>