Index: trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 1154)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java	(revision 1155)
@@ -90,4 +90,6 @@
 			String v1 = caseSensitive ? value : value.toLowerCase();
 			String v2 = caseSensitive ? this.value : this.value.toLowerCase();
+ 			v1 = java.text.Normalizer.normalize(v1, java.text.Normalizer.Form.NFC);
+ 			v2 = java.text.Normalizer.normalize(v2, java.text.Normalizer.Form.NFC);
 			return v1.indexOf(v2) != -1;
 		}
@@ -102,12 +104,14 @@
 				return s.equals("");
 			String search = caseSensitive ? s : s.toLowerCase();
+			search = java.text.Normalizer.normalize(search, java.text.Normalizer.Form.NFC);
 			for (Entry<String, String> e : osm.keys.entrySet()) {
 				String key = caseSensitive ? e.getKey() : e.getKey().toLowerCase();
 				String value = caseSensitive ? e.getValue() : e.getValue().toLowerCase();
+				value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
 				if (key.indexOf(search) != -1 || value.indexOf(search) != -1)
 					return true;
 			}
 			if (osm.user != null) {
-				String name = osm.user.name;
+				String name = java.text.Normalizer.normalize(osm.user.name, java.text.Normalizer.Form.NFC);
 				if (!caseSensitive)
 					name = name.toLowerCase();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 1154)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 1155)
@@ -209,7 +209,9 @@
 
 		String value = values.getEditor().getItem().toString();
+		value = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
 		if (value.equals(""))
 			value = null; // delete the key
 		String newkey = keys.getEditor().getItem().toString();
+		newkey = java.text.Normalizer.normalize(value, java.text.Normalizer.Form.NFC);
 		if (newkey.equals("")) {
 			newkey = key;