Index: /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java	(revision 30613)
+++ /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java	(revision 30614)
@@ -117,6 +117,6 @@
         setupDialog();
         getRootPane().setDefaultButton(defaultButton);
-        setVisible(true);
-        lo.requestFocus();
+        pack();
+        lo.requestFocusInWindow();
     }
 
Index: /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java	(revision 30613)
+++ /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java	(revision 30614)
@@ -48,5 +48,4 @@
     private final Way outline, street;
     private final String streetName;
-    private final String buildingType;
     private final Node init;
     private final Relation associatedStreet;
@@ -78,13 +77,9 @@
         this.street = street;
         this.streetName = streetName;
-        this.buildingType = buildingType;
         this.associatedStreet = associatedStreet;
         this.housenumbers = housenumbers;
 
-        // This dialog is started modal
         this.dialog = new HouseNumberInputDialog(this, street, streetName, buildingType,
                 associatedStreet != null, housenumbers);
-
-        // We're done
     }
 
Index: /applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java	(revision 30613)
+++ /applications/editors/josm/plugins/terracer/src/terracer/TerracerAction.java	(revision 30614)
@@ -232,5 +232,5 @@
             // show input dialog.
             new HouseNumberInputHandler(this, outline, init, street, streetname, outline.get("building"),
-                    associatedStreet, housenumbers, title);
+                    associatedStreet, housenumbers, title).dialog.showDialog();
         }
     }