diff --git a/src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java b/src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java
index 37cebc9d..547f4b2a 100644
--- a/src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/gui/MainActivity.java
@@ -285,11 +285,6 @@ public class MainActivity extends ActionBarActivity
 			case R.id.settings:
 				startActivity(new Intent(this, SettingsActivity.class));
 				return true;
-			case R.id.exit:
-				// Make sure we unbind first.
-				finish();
-				getApplicationContext().stopService(new Intent(this, SyncthingService.class));
-				return true;
 			default:
 				return super.onOptionsItemSelected(item);
 		}
diff --git a/src/main/res/menu/main.xml b/src/main/res/menu/main.xml
index f8a5700b..028cfe46 100644
--- a/src/main/res/menu/main.xml
+++ b/src/main/res/menu/main.xml
@@ -29,8 +29,4 @@
 			android:id="@+id/settings"
 			android:title="@string/settings_title" />
 
-	<item
-			android:id="@+id/exit"
-			android:title="@string/exit" />
-
 </menu>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index fa21062b..6d6843cb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -176,9 +176,6 @@ Please install a scanner or enter the node ID manually.</string>
 	<!-- Shown instead of web_gui_loading if the key does not exist and has to be created -->
 	<string name="web_gui_creating_key">Generating keys. This may take a while.</string>
 
-	<!-- Menu item that stops Activity and Service -->
-	<string name="exit">Exit</string>
-
 	<!-- Title for dialog displayed on first start -->
 	<string name="welcome_title">First Start</string>
 
@@ -241,8 +238,12 @@ If this error persists, try reinstalling the app and restarting your device.\n\n
     <!-- Message of the "syncthing disabled" dialog -->
     <string name="syncthing_disabled_message">Do you want to change your preferences?</string>
 
+	<!-- Button text on the "syncthing disabled" dialog -->
     <string name="syncthing_disabled_change_settings">Change Settings</string>
 
+	<!-- Button text on the "syncthing disabled" dialog -->
+	<string name="exit">Exit</string>
+
 	<!-- RestApi -->