diff --git a/app/src/processing/mode/android/AndroidEditor.java b/app/src/processing/mode/android/AndroidEditor.java
index ab2d424ce..b6b5814d2 100644
--- a/app/src/processing/mode/android/AndroidEditor.java
+++ b/app/src/processing/mode/android/AndroidEditor.java
@@ -114,7 +114,7 @@ public class AndroidEditor extends JavaEditor {
   
   public JMenu buildFileMenu() {
     String exportPkgTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, false);
-    JMenuItem exportPackage = Base.newJMenuItemShift(exportPkgTitle, 'E');
+    JMenuItem exportPackage = Base.newJMenuItem(exportPkgTitle, 'E');
     exportPackage.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handleExportPackage();
@@ -122,7 +122,7 @@ public class AndroidEditor extends JavaEditor {
     });
     
     String exportProjectTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, true);
-    JMenuItem exportProject = Base.newJMenuItem(exportProjectTitle, 'E');
+    JMenuItem exportProject = Base.newJMenuItemShift(exportProjectTitle, 'E');
     exportProject.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handleExportProject();
diff --git a/app/src/processing/mode/android/AndroidToolbar.java b/app/src/processing/mode/android/AndroidToolbar.java
index df2343421..734b9b0f7 100644
--- a/app/src/processing/mode/android/AndroidToolbar.java
+++ b/app/src/processing/mode/android/AndroidToolbar.java
@@ -59,7 +59,7 @@ public class AndroidToolbar extends EditorToolbar {
     case NEW:    return !shift ? "New" : "New Editor Window";
     case OPEN:   return !shift ? "Open" : "Open in Another Window";
     case SAVE:   return "Save";
-    case EXPORT: return !shift ? "Export Android Project" : "Export Signed Package";
+    case EXPORT: return !shift ? "Export Signed Package" : "Export Android Project";
     }
     return null;
   }
diff --git a/app/src/processing/mode/java/JavaToolbar.java b/app/src/processing/mode/java/JavaToolbar.java
index baa90c383..c3dce52ae 100644
--- a/app/src/processing/mode/java/JavaToolbar.java
+++ b/app/src/processing/mode/java/JavaToolbar.java
@@ -116,9 +116,9 @@ public class JavaToolbar extends EditorToolbar {
 
     case EXPORT:
       if (shift) {
-        jeditor.handleExportApplication();
-      } else {
         jeditor.handleExportApplet();
+      } else {
+        jeditor.handleExportApplication();
       }
       break;
     }