diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 338404e25e3..c1b414e8ef8 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -507,6 +507,10 @@ public void applyPreferences() {
 
 
   private void buildMenuBar() {
+<<<<<<< HEAD
+  fileMenu.setMnemonic(trm("File"));
+=======
+>>>>>>> 715b3eb641bd102dde3ffee8db27564e1e8f5bf3
     JMenuBar menubar = new JMenuBar();
     final JMenu fileMenu = buildFileMenu();
     fileMenu.addMenuListener(new StubMenuListener() {
@@ -566,6 +570,17 @@ public void menuSelected(MenuEvent e) {
 
     menubar.add(buildHelpMenu());
     setJMenuBar(menubar);
+        fileMenu.setMnemonic(trm("File"));
+    public static int trm(String s) {
+          try {
+             if (i18n == null)
+               return s.charAt(0);
+             else
+               return i18n.getString(s).charAt(0);
+           } catch (MissingResourceException e) {
+               return s.charAt(0);
+          }
+  }
   }
 
 
diff --git a/build/linux/dist/install.sh b/build/linux/dist/install.sh
index 0fa79ea5003..91ccf811d00 100755
--- a/build/linux/dist/install.sh
+++ b/build/linux/dist/install.sh
@@ -205,6 +205,14 @@ simple_uninstall_f() {
 # Update desktop file and mime databases (if possible)
 updatedbs_f() {
 
+    if [ -f ${HOME}/.local/.config/mimeapps.list ] 
+  then
+    continue
+  else 
+    touch mimeapps.list
+    chmod +x mimeapps.list
+  fi
+  
   if [ -d "${HOME}/.local/share/applications" ]; then
     if command -v update-desktop-database > /dev/null; then
       update-desktop-database "${HOME}/.local/share/applications"