Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 560)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 561)
@@ -161,5 +161,6 @@
 		applyAudio.addActionListener(new ActionListener() {
 			public void actionPerformed(ActionEvent e) {
-				JFileChooser fc = new JFileChooser(Main.pref.get("tagimages.lastdirectory"));
+				String dir = Main.pref.get("markers.lastaudiodirectory");
+				JFileChooser fc = new JFileChooser(dir);
 				fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 				fc.setAcceptAllFileFilterUsed(false);
@@ -174,4 +175,6 @@
 				fc.showOpenDialog(Main.parent);
 				File sel = fc.getSelectedFile();
+				if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir))
+					Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath());
 				if (sel == null)
 					return;
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 560)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 561)
@@ -295,5 +295,6 @@
 		applyaudio.addActionListener(new ActionListener(){
 			public void actionPerformed(ActionEvent e) {
-				JFileChooser fc = new JFileChooser(Main.pref.get("tagimages.lastdirectory"));
+				String dir = Main.pref.get("markers.lastaudiodirectory");
+				JFileChooser fc = new JFileChooser(dir);
 				fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
 				fc.setAcceptAllFileFilterUsed(false);
@@ -308,4 +309,6 @@
 				fc.showOpenDialog(Main.parent);
 				File sel = fc.getSelectedFile();
+				if (!fc.getCurrentDirectory().getAbsolutePath().equals(dir))
+					Main.pref.put("markers.lastaudiodirectory", fc.getCurrentDirectory().getAbsolutePath());
 				if (sel == null)
 					return;