diff --git a/index.html b/index.html
index 63094a4..19a8e8f 100644
--- a/index.html
+++ b/index.html
@@ -10,12 +10,12 @@
 <div id="content">
 	<fieldset>
 		<legend>Server Location</legend>
-		<div>
+		<form>
 			<label>URL:</label>
-			<input type="text" id="serverUrl" value="ws://"/>
-			<button id="connectButton">Open</button>
+			<input type="text" id="serverUrl" name="serverUrl" autocomplete="on" value="ws://"/>
+			<button id="connectButton" type="submit">Open</button>
 			<button id="disconnectButton">Close</button>
-		</div>
+		</form>
 		<div>
 			<label>Status:</label>
 			<span id="connectionStatus">CLOSED</span>
diff --git a/index.js b/index.js
index 71dbc21..4efa892 100644
--- a/index.js
+++ b/index.js
@@ -91,6 +91,7 @@ new function() {
 			sendButton = $('#sendButton');
 			
 			connectButton.click(function(e) {
+                e.preventDefault();
 				close();
 				open();
 			});
diff --git a/manifest.json b/manifest.json
index 382f999..8ec1d3c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Simple WebSocket Client",
   "manifest_version": 2,
-  "version": "0.1.3",
+  "version": "0.2.3",
   "description": "Construct custom Web Socket requests and handle responses to directly test your Web Socket services.",
   "icons": {
     "16":  "resources/icon_032.png",