diff --git a/app/src/main/java/com/limelight/AppView.java b/app/src/main/java/com/limelight/AppView.java
index 93e5431a..3568c382 100644
--- a/app/src/main/java/com/limelight/AppView.java
+++ b/app/src/main/java/com/limelight/AppView.java
@@ -22,6 +22,8 @@ import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;
 
 import android.app.Activity;
+import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -44,9 +46,10 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 	private boolean remote;
     private boolean firstLoad = true;
 	
-	private final static int RESUME_ID = 1;
+	private final static int START_OR_RESUME_ID = 1;
 	private final static int QUIT_ID = 2;
 	private final static int CANCEL_ID = 3;
+    private final static int START_WTIH_QUIT = 4;
 	
 	public final static String ADDRESS_EXTRA = "Address";
 	public final static String UNIQUEID_EXTRA = "UniqueId";
@@ -151,11 +154,11 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
         int runningAppId = getRunningAppId();
         if (runningAppId != -1) {
         	if (runningAppId == selectedApp.app.getAppId()) {
-                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
+                menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
                 menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
         	}
         	else {
-                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_quit_and_start));
+                menu.add(Menu.NONE, START_WTIH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
                 menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
         	}
         }
@@ -165,18 +168,61 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
 	public void onContextMenuClosed(Menu menu) {
 	}
 
+    private void displayQuitConfirmationDialog(final Runnable onYes, final Runnable onNo) {
+        DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which){
+                    case DialogInterface.BUTTON_POSITIVE:
+                        if (onYes != null) {
+                            onYes.run();
+                        }
+                        break;
+
+                    case DialogInterface.BUTTON_NEGATIVE:
+                        if (onNo != null) {
+                            onNo.run();
+                        }
+                        break;
+                }
+            }
+        };
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setMessage(getResources().getString(R.string.applist_quit_confirmation))
+                .setPositiveButton(getResources().getString(R.string.yes), dialogClickListener)
+                .setNegativeButton(getResources().getString(R.string.no), dialogClickListener)
+                .show();
+    }
+
     @Override
     public boolean onContextItemSelected(MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        AppObject app = (AppObject) appGridAdapter.getItem(info.position);
+        final AppObject app = (AppObject) appGridAdapter.getItem(info.position);
         switch (item.getItemId()) {
-            case RESUME_ID:
+            case START_WTIH_QUIT:
+                // Display a confirmation dialog first
+                displayQuitConfirmationDialog(new Runnable() {
+                    @Override
+                    public void run() {
+                        doStart(app.app);
+                    }
+                }, null);
+                return true;
+
+            case START_OR_RESUME_ID:
                 // Resume is the same as start for us
                 doStart(app.app);
                 return true;
 
             case QUIT_ID:
-                doQuit(app.app);
+                // Display a confirmation dialog first
+                displayQuitConfirmationDialog(new Runnable() {
+                    @Override
+                    public void run() {
+                        doQuit(app.app);
+                    }
+                }, null);
                 return true;
 
             case CANCEL_ID:
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index a178e5b5..02248443 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -56,6 +56,8 @@
     <!-- General strings -->
     <string name="ip_hint">Indirizzo IP del PC</string>
     <string name="searching_pc">Ricerca PC in corso…</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 
     <!-- AppList activity -->
     <string name="title_applist">Applicazioni su</string>
@@ -70,6 +72,7 @@
     <string name="applist_quit_app">Chiusura in corso…</string>
     <string name="applist_quit_success">Sessione chiusa con successo</string>
     <string name="applist_quit_fail">Chiusura sessione fallita</string>
+    <string name="applist_quit_confirmation">Are you sure you want to quit the running app? All unsaved data will be lost.</string>
 
     <!-- Add computer manually activity -->
     <string name="title_add_pc">Aggiungi PC Manualmente</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b9a58ee2..2b9e1a68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -56,6 +56,8 @@
     <!-- General strings -->
     <string name="ip_hint">IP address of GeForce PC</string>
     <string name="searching_pc">Searching for PCs…</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
     
     <!-- AppList activity -->
     <string name="title_applist">Apps on</string>
@@ -70,7 +72,8 @@
     <string name="applist_quit_app">Quitting</string>
     <string name="applist_quit_success">Successfully quit</string>
     <string name="applist_quit_fail">Failed to quit</string>
-    
+    <string name="applist_quit_confirmation">Are you sure you want to quit the running app? All unsaved data will be lost.</string>
+
     <!-- Add computer manually activity -->
     <string name="title_add_pc">Add PC Manually</string>
     <string name="msg_add_pc">Connecting to the PC…</string>