Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6038)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 6039)
@@ -508,6 +508,11 @@
                 new LayerSaveAction(this),
                 new LayerSaveAsAction(this),
-                new LayerGpxExportAction(this),
-                new ConvertToGpxLayerAction(),
+        }));
+        if (ExpertToggleAction.isExpert()) {
+            actions.addAll(Arrays.asList(new Action[]{
+                    new LayerGpxExportAction(this),
+                    new ConvertToGpxLayerAction()}));
+        }
+        actions.addAll(Arrays.asList(new Action[]{
                 SeparatorLayerAction.INSTANCE,
                 new RenameLayerAction(getAssociatedFile(), this)}));