diff --git a/development/MacOSX/lyxeditor b/development/MacOSX/lyxeditor
index bee481fec0..d1e17cb6ce 100755
--- a/development/MacOSX/lyxeditor
+++ b/development/MacOSX/lyxeditor
@@ -41,7 +41,7 @@ test -d "${USER_SUPPORT}" || {
 	exit 1
 }
 
-for LYXDIR in LyX-1.5 LyX-1.4 LyX
+for LYXDIR in LyX-1.6 LyX-1.5 LyX-1.4 LyX
 do
 	ABS_USER_LYXDIR="${USER_SUPPORT}/${LYXDIR}"
 	test -d "${ABS_USER_LYXDIR}" || {
diff --git a/lib/bind/mac.bind b/lib/bind/mac.bind
index 550bf6a370..955d8b43d1 100644
--- a/lib/bind/mac.bind
+++ b/lib/bind/mac.bind
@@ -79,7 +79,7 @@
 #bind "F1"			"help"			# Not yet implemented!
 #bind "C-F1"			"help-context"		# Not yet implemented!
 \bind "F2"			"buffer-write"
-\bind "F3"			"word-find"
+\bind "C-g"			"word-find"
 \bind "C-F4"			"buffer-close"
 \bind "F5"			"screen-recenter"
 \bind "M-F4"			"lyx-quit"