diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 0497bccb78..b635ba50b4 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -237,7 +237,6 @@ fixup_bundle_environment (int, char* [])
 	
 	setenv ("ARDOUR_SURFACES_PATH", path.c_str(), 1);
 
-
 	path = dir_path;
 	path += "/../Frameworks/clearlooks";
 
@@ -424,6 +423,18 @@ fixup_bundle_environment (int /*argc*/, char* argv[])
 	
 	setenv ("ARDOUR_PANNER_PATH", path.c_str(), 1);
 
+	cstr = getenv ("ARDOUR_SURFACES_PATH");
+	if (cstr) {
+		path = cstr;
+		path += ':';
+	} else {
+		path = "";
+	}
+	path += dir_path;
+	path += "/lib/surfaces";
+	
+	setenv ("ARDOUR_SURFACES_PATH", path.c_str(), 1);
+
 	path = dir_path;
 	path += "/lib/clearlooks";