diff --git a/app/src/main/java/com/limelight/preferences/AddComputerManually.java b/app/src/main/java/com/limelight/preferences/AddComputerManually.java
index 51ba1bbc..6c4f49fc 100644
--- a/app/src/main/java/com/limelight/preferences/AddComputerManually.java
+++ b/app/src/main/java/com/limelight/preferences/AddComputerManually.java
@@ -7,6 +7,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.R;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
@@ -16,14 +17,17 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
 public class AddComputerManually extends Activity {
-	private Button addPcButton;
 	private TextView hostText;
 	private ComputerManagerService.ComputerManagerBinder managerBinder;
 	private LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
@@ -43,6 +47,9 @@ public class AddComputerManually extends Activity {
 	private void doAddPc(String host) {
 		String msg;
 		boolean finish = false;
+
+        SpinnerDialog dialog = SpinnerDialog.displayDialog(this, "Add PC Manually", "Connecting to the specified PC...", false);
+
 		try {
 			InetAddress addr = InetAddress.getByName(host);
 			
@@ -56,8 +63,10 @@ public class AddComputerManually extends Activity {
 		} catch (UnknownHostException e) {
 			msg = "Unable to resolve PC address. Make sure you didn't make a typo in the address.";
 		}
-		
-		final boolean toastFinish = finish;
+
+        dialog.dismiss();
+
+        final boolean toastFinish = finish;
 		final String toastMsg = msg;
 		AddComputerManually.this.runOnUiThread(new Runnable() {
 			@Override
@@ -110,6 +119,7 @@ public class AddComputerManually extends Activity {
 		super.onStop();
 		
 		Dialog.closeDialogs();
+        SpinnerDialog.closeDialogs(this);
 	}
 	
 	@Override
@@ -130,24 +140,28 @@ public class AddComputerManually extends Activity {
 
         UiHelper.notifyNewRootView(this);
 
-        this.addPcButton = (Button) findViewById(R.id.addPc);
 		this.hostText = (TextView) findViewById(R.id.hostTextView);
+        hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
+        hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
+            @Override
+            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
+                if (actionId == EditorInfo.IME_ACTION_DONE ||
+                        keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
+                                keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER) {
+                    if (hostText.getText().length() == 0) {
+                        Toast.makeText(AddComputerManually.this, "You must enter an IP address", Toast.LENGTH_LONG).show();
+                        return true;
+                    }
+
+                    computersToAdd.add(hostText.getText().toString());
+                }
+
+                return false;
+            }
+        });
 		
 		// Bind to the ComputerManager service
 		bindService(new Intent(AddComputerManually.this,
-				ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
-	
-		addPcButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				if (hostText.getText().length() == 0) {
-					Toast.makeText(AddComputerManually.this, "You must enter an IP address", Toast.LENGTH_LONG).show();
-					return;
-				}
-				
-				Toast.makeText(AddComputerManually.this, "Adding PC...", Toast.LENGTH_SHORT).show();
-				computersToAdd.add(hostText.getText().toString());
-			}
-		});
+                ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
 	}
 }
diff --git a/app/src/main/res/layout/activity_add_computer_manually.xml b/app/src/main/res/layout/activity_add_computer_manually.xml
index eff85fee..696d0297 100644
--- a/app/src/main/res/layout/activity_add_computer_manually.xml
+++ b/app/src/main/res/layout/activity_add_computer_manually.xml
@@ -8,13 +8,23 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".AddComputerManually" >
 
+    <TextView
+        android:id="@+id/manuallyAddPcText"
+        android:text="@string/title_add_pc"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:textAppearance="?android:attr/textAppearanceLarge"
+        android:layout_alignParentTop="true"/>
+
     <EditText
         android:id="@+id/hostTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_below="@+id/manuallyAddPcText"
+        android:layout_marginTop="25dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentTop="true"
         android:ems="10"
         android:singleLine="true"
         android:inputType="textNoSuggestions"
@@ -22,13 +32,5 @@
         
         <requestFocus />
     </EditText>
-
-    <Button
-        android:id="@+id/addPc"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/hostTextView"
-        android:layout_centerHorizontal="true"
-        android:text="@string/button_add_pc" />
 	
 </RelativeLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e07faf4..8c0cfe6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,13 +4,9 @@
     <!-- General strings -->
     <string name="ip_hint">IP address of GeForce PC</string>
     
-    <!-- PC view activity -->
-    <string name="title_pc_view">PC List</string>
-    <string name="button_stream_settings">Settings</string>
-    <string name="button_add_pc_manually">Add PC</string>
-    
     <!-- Add computer manually activity -->
-    <string name="button_add_pc">Manually Add PC</string>
+    <string name="title_add_pc">Add PC Manually</string>
+    <string name="button_add_pc">Add PC</string>
 
     <!-- Preferences -->
     <string name="category_basic_settings">Basic Settings</string>