diff --git a/app/src/processing/mode/android/AndroidEditor.java b/app/src/processing/mode/android/AndroidEditor.java
index ca35952ce..0dd70c9b4 100644
--- a/app/src/processing/mode/android/AndroidEditor.java
+++ b/app/src/processing/mode/android/AndroidEditor.java
@@ -113,22 +113,23 @@ public class AndroidEditor extends JavaEditor {
 
   
   public JMenu buildFileMenu() {
-    String exportTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, false);
-    JMenuItem exportProject = Base.newJMenuItem(exportTitle, 'E');
-    exportProject.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        handleExportProject();
-      }
-    });
-      
-    exportTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, true);
-    JMenuItem exportPackage = Base.newJMenuItemShift(exportTitle, 'E');
+    String exportPkgTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, false);
+    JMenuItem exportPackage = Base.newJMenuItemShift(exportPkgTitle, 'E');
     exportPackage.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         handleExportApplication();
       }
     });
-    return buildFileMenu(new JMenuItem[] { exportProject, exportPackage });
+    
+    String exportProjectTitle = AndroidToolbar.getTitle(AndroidToolbar.EXPORT, true);
+    JMenuItem exportProject = Base.newJMenuItem(exportProjectTitle, 'E');
+    exportProject.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        handleExportProject();
+      }
+    });
+
+    return buildFileMenu(new JMenuItem[] { exportPackage, exportProject});
   }
   
   
diff --git a/app/src/processing/mode/java/JavaEditor.java b/app/src/processing/mode/java/JavaEditor.java
index 89738e852..80a875a82 100644
--- a/app/src/processing/mode/java/JavaEditor.java
+++ b/app/src/processing/mode/java/JavaEditor.java
@@ -47,7 +47,14 @@ public class JavaEditor extends Editor {
 
   
   public JMenu buildFileMenu() {
-    String appletTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, false);
+    String appTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, false);
+    JMenuItem exportApplication = Base.newJMenuItemShift(appTitle, 'E');
+    exportApplication.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        handleExportApplication();
+      }
+    });
+    String appletTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, true);
     JMenuItem exportApplet = Base.newJMenuItem(appletTitle, 'E');
     exportApplet.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
@@ -55,14 +62,7 @@ public class JavaEditor extends Editor {
       }
     });
 
-    String appTitle = JavaToolbar.getTitle(JavaToolbar.EXPORT, true);
-    JMenuItem exportApplication = Base.newJMenuItemShift(appTitle, 'E');
-    exportApplication.addActionListener(new ActionListener() {
-      public void actionPerformed(ActionEvent e) {
-        handleExportApplication();
-      }
-    });
-    return buildFileMenu(new JMenuItem[] { exportApplet, exportApplication });
+    return buildFileMenu(new JMenuItem[] { exportApplication, exportApplet });
   }
   
   
diff --git a/todo.txt b/todo.txt
index 53d6653e1..ca92a1bb3 100644
--- a/todo.txt
+++ b/todo.txt
@@ -2,6 +2,7 @@
 X implement movie maker tool
 X   http://code.google.com/p/processing/issues/detail?id=836
 X add movie maker tool to the build scripts
+X swap order of applet/application in the file menu
 
 _ move Movie Maker out to its own separate tool package
 _   http://code.google.com/p/processing/issues/detail?id=837