Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 3097)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/SetWaypointAction.java	(revision 3098)
@@ -20,4 +20,6 @@
 
 import at.dallermassl.josm.plugin.surveyor.GpsActionEvent;
+import at.dallermassl.josm.plugin.surveyor.SurveyorPlugin;
+import at.dallermassl.josm.plugin.surveyor.action.gui.WaypointDialog;
 
 /**
@@ -31,4 +33,5 @@
     private MarkerLayer markerLayer;
     public static final String MARKER_LAYER_NAME = "surveyorwaypointlayer";
+    private WaypointDialog dialog;
     
     /**
@@ -57,7 +60,17 @@
         }
         
+        if(dialog == null) {
+            dialog = new WaypointDialog();
+        }
+        
+        String markerText = markerTitle;
+        String inputText = dialog.openDialog(SurveyorPlugin.getSurveyorFrame(), "Waypoint Description");
+        if(inputText != null && inputText.length() > 0) {
+            markerText = markerText + " " + inputText;
+        }
+        
         String iconName = getParameters().size() > 1 ? getParameters().get(1) : null;
         synchronized(LiveGpsLock.class) {
-            layer.data.add(new Marker(event.getCoordinates(), markerTitle, iconName));
+            layer.data.add(new Marker(event.getCoordinates(), markerText, iconName));
         }
         Main.map.repaint();
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/DialogClosingThread.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/DialogClosingThread.java	(revision 3098)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/DialogClosingThread.java	(revision 3098)
@@ -0,0 +1,142 @@
+/**
+ * 
+ */
+package at.dallermassl.josm.plugin.surveyor.action.gui;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
+
+import javax.swing.JDialog;
+import javax.swing.JTextField;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+/**
+ * @author cdaller
+ *
+ */
+public class DialogClosingThread extends Thread implements KeyListener, DocumentListener {
+    private static long DEFAULT_TIMEOUT = 5000;
+    private JDialog dialog;
+    private long timeout;
+    private String dialogTitle;
+    private long loopCount;
+    
+    /**
+     * Using the given dialog and the default timeout.
+     * @param dialog
+     */
+    public DialogClosingThread(JDialog dialog) {
+        this(dialog, DEFAULT_TIMEOUT);
+    }   
+       
+    /**
+     * @param dialog
+     * @param timeout
+     */
+    public DialogClosingThread(JDialog dialog, long timeout) {
+        super();
+        this.dialog = dialog;
+        this.timeout = timeout;
+        this.loopCount = timeout / 1000;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Thread#run()
+     */
+    @Override
+    public void run() {
+        String title = dialog.getTitle();
+        while(loopCount > 0) {
+            dialog.setTitle(title + " (" + loopCount + "sec)");
+            --loopCount;
+            try {
+                sleep(1000);
+            } catch(InterruptedException ignore) {}
+        }
+
+        dialog.setVisible(false);
+        dialog.dispose();
+    }
+    
+    public void reset() {
+        this.loopCount = timeout / 1000;
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent)
+     */
+    @Override
+    public void keyPressed(KeyEvent e) {
+        reset();
+        System.out.println("keypressed: " + e.getKeyCode());
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent)
+     */
+    @Override
+    public void keyReleased(KeyEvent e) {
+        reset();
+        System.out.println("keyreleased: " + e.getKeyCode());
+    }
+
+    /* (non-Javadoc)
+     * @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent)
+     */
+    @Override
+    public void keyTyped(KeyEvent e) {
+        reset();
+        System.out.println("keytyped: " + e.getKeyCode());
+    }
+
+    /**
+     * @param optionPane
+     */
+    public void observe(Container container) {
+        for(Component component : container.getComponents()) {
+            if(component instanceof JTextField) {
+                observe((JTextField)component);
+            } else {
+                observe(component);
+            }
+        }
+    }
+    
+    public void observe(Component component) {
+        component.addKeyListener(this);
+    }
+    
+    public void observe(JTextField textfield) {
+        textfield.getDocument().addDocumentListener(this);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.event.DocumentListener#changedUpdate(javax.swing.event.DocumentEvent)
+     */
+    @Override
+    public void changedUpdate(DocumentEvent e) {
+        reset();
+        System.out.println("changedUpdate: " + e);        
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.event.DocumentListener#insertUpdate(javax.swing.event.DocumentEvent)
+     */
+    @Override
+    public void insertUpdate(DocumentEvent e) {
+        reset();
+        System.out.println("insertUpdate: " + e);
+    }
+
+    /* (non-Javadoc)
+     * @see javax.swing.event.DocumentListener#removeUpdate(javax.swing.event.DocumentEvent)
+     */
+    @Override
+    public void removeUpdate(DocumentEvent e) {
+        reset();
+        System.out.println("removeUpdate: " + e);        
+    }
+}
Index: applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/WaypointDialog.java
===================================================================
--- applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/WaypointDialog.java	(revision 3098)
+++ applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/action/gui/WaypointDialog.java	(revision 3098)
@@ -0,0 +1,101 @@
+/**
+ * 
+ */
+package at.dallermassl.josm.plugin.surveyor.action.gui;
+
+import java.awt.BorderLayout;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyChangeListener;
+
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JTextField;
+
+
+/**
+ * @author cdaller
+ *
+ */
+public class WaypointDialog {
+    
+    public String openDialog(JFrame frame, String message) {
+        
+        JTextField textField = new JTextField(10);
+
+        //Create an array of the text and components to be displayed.
+        Object[] array = {message, textField};
+
+        //Create an array specifying the number of dialog buttons
+        //and their text.
+        Object[] options = {"OK"};
+
+        //Create the JOptionPane.
+        final JOptionPane optionPane = new JOptionPane(array,
+                                    JOptionPane.QUESTION_MESSAGE,
+                                    JOptionPane.OK_OPTION,
+                                    null,
+                                    options,
+                                    options[0]);
+
+//        final JOptionPane optionPane = new JOptionPane("The only way to close this dialog is by\n"
+//                        + "pressing one of the following buttons.\n" + "Do you understand?",
+//            JOptionPane.QUESTION_MESSAGE, JOptionPane.YES_NO_OPTION);
+
+
+        final JDialog dialog = new JDialog(frame, "Enter Description", true);
+        DialogClosingThread closer = new DialogClosingThread(dialog);
+        closer.observe(textField);
+        dialog.setContentPane(optionPane);
+        optionPane.addPropertyChangeListener(new PropertyChangeListener() {
+            public void propertyChange(PropertyChangeEvent e) {
+                String prop = e.getPropertyName();
+
+                if (dialog.isVisible() && (e.getSource() == optionPane)
+                                && (prop.equals(JOptionPane.VALUE_PROPERTY))) {
+                    // If you were going to check something
+                    // before closing the window, you'd do
+                    // it here.
+                    dialog.setVisible(false);
+                }
+            }
+        });
+        closer.start();
+        dialog.pack();
+        dialog.setVisible(true);
+        
+
+        System.out.println("value: " + optionPane.getValue());
+        return textField.getText();
+
+//        int value = ((Integer) optionPane.getValue()).intValue();
+//        if (value == JOptionPane.YES_OPTION) {
+//            System.out.println("yes");
+//        } else if (value == JOptionPane.NO_OPTION) {
+//            System.out.println("no");
+//        }
+
+    }
+
+    public static void main(String[] args) {
+        //1. Create the frame.
+          JFrame frame = new JFrame("FrameDemo");
+
+          //2. Optional: What happens when the frame closes?
+          frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
+          //3. Create components and put them in the frame.
+          //...create emptyLabel...
+          frame.getContentPane().add(new JLabel("test"), BorderLayout.CENTER);
+
+          //4. Size the frame.
+          frame.pack();
+          frame.setSize(600,400);
+          frame.setLocation(0,0);
+
+          //5. Show it.
+          frame.setVisible(true);
+          new WaypointDialog().openDialog(frame, "test");
+      }
+}