diff --git a/tools/idegen/idegen.sh b/tools/idegen/idegen.sh
index d7e6986d8..a24fca58e 100755
--- a/tools/idegen/idegen.sh
+++ b/tools/idegen/idegen.sh
@@ -5,9 +5,14 @@ if [ ! -d development ]; then
     exit 1
 fi
 
+if [[ -z ${OUT_DIR_COMMON_BASE} ]]; then
 idegenjar=`find out -name idegen.jar -follow | grep -v intermediates`
+else
+idegenjar=`find $OUT_DIR_COMMON_BASE/$(basename "$PWD") -name idegen.jar -follow | grep -v intermediates`
+fi
+
 if [ "" = "$idegenjar" ]; then
     echo "Couldn't find idegen.jar. Please run make first."
-else 
+else
     java -cp $idegenjar Main
 fi