diff --git a/res/layout/activity_connection.xml b/res/layout/activity_connection.xml
index 690e657b..d8eabccc 100644
--- a/res/layout/activity_connection.xml
+++ b/res/layout/activity_connection.xml
@@ -30,8 +30,6 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/hostTextView"
         android:layout_centerHorizontal="true"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
         android:text="Start Streaming Steam!" >
         
         <requestFocus />
diff --git a/src/com/limelight/Connection.java b/src/com/limelight/Connection.java
index fddd17ca..2b65e5b3 100644
--- a/src/com/limelight/Connection.java
+++ b/src/com/limelight/Connection.java
@@ -15,6 +15,7 @@ import com.limelight.nvstream.http.NvHTTP;
 import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
@@ -52,6 +53,9 @@ public class Connection extends Activity {
 		
 		setContentView(R.layout.activity_connection);
 		
+		// Hide the keyboard by default
+		this.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+		
 		this.statusButton = (Button) findViewById(R.id.statusButton);
 		this.pairButton = (Button) findViewById(R.id.pairButton);
 		this.hostText = (TextView) findViewById(R.id.hostTextView);