diff --git a/VimAck/Classes/AppDelegate.rb b/VimAck/Classes/AppDelegate.rb
index 0681287..38cff66 100644
--- a/VimAck/Classes/AppDelegate.rb
+++ b/VimAck/Classes/AppDelegate.rb
@@ -90,7 +90,7 @@ def showOpenDialog
     def showStatusBarMenu
         statusItem = NSStatusBar.systemStatusBar.statusItemWithLength NSVariableStatusItemLength
         statusItem.menu = statusMenu
-        statusItem.title = "Waldo"
+        statusItem.title = "W"
         statusItem.highlightMode = true
     end
     
@@ -129,6 +129,7 @@ def openWaldoWithProjectRoot(path)
             ackWindowController.projectRoot = path
             ackWindowController.window.setTitle "Searching in #{path}"
             ackWindowController.showWindow nil
+            ackWindowController.window.defaultButtonCell = ackWindowController.searchButton
 
             ackWindowController.window.makeKeyAndOrderFront(self)
             NSApplication.sharedApplication.arrangeInFront self
diff --git a/VimAck/Waldo-Info.plist b/VimAck/Waldo-Info.plist
index db47fe6..bb8985e 100644
--- a/VimAck/Waldo-Info.plist
+++ b/VimAck/Waldo-Info.plist
@@ -17,11 +17,22 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3</string>
+	<string>0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.jtaby.${PRODUCT_NAME}.URLId</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>waldo</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
-	<string>0.3</string>
+	<string>0.4</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
@@ -36,16 +47,5 @@
 	<string>http://jtaby.com/Waldo/appcast.xml</string>
 	<key>SUPublicDSAKeyFile</key>
 	<string>dsa_pub.pem</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>com.jtaby.${PRODUCT_NAME}.URLId</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>waldo</string>
-			</array>
-		</dict>
-	</array>
 </dict>
 </plist>