diff --git a/Makefile b/Makefile
index 2a8948fd..52b55c68 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,9 @@ CLOSURE=build/tools/closure-compiler.jar
 ZIP=zip
 
 # All files that will be compiled by the Closure compiler.
+
 JS_FILES=\
+	contextmenu/jquery.contextmenu.js \
 	browser.js \
 	svgtransformlist.js \
 	math.js \
@@ -55,6 +57,8 @@ $(COMPILED_JS):
 		$(CLOSURE_JS_ARGS) \
 		--js_output_file $(COMPILED_JS)
 
+compile: $(COMPILED_JS)
+
 release: build/$(PACKAGE)
 	cd build ; $(ZIP) $(PACKAGE).zip -r $(PACKAGE) ; cd ..
 	tar -z -c -f build/$(PACKAGE)-src.tar.gz \
diff --git a/editor/contextmenu/jquery.contextMenu.js b/editor/contextmenu/jquery.contextMenu.js
index 3892cc3b..86bb8f8f 100755
--- a/editor/contextmenu/jquery.contextMenu.js
+++ b/editor/contextmenu/jquery.contextMenu.js
@@ -38,12 +38,12 @@ if(jQuery)( function() {
 				menu.addClass('contextMenu');
 				
 				// Simulate a true right click
-				$(this).mousedown( function(e) {
+				$(this).bind( "contextmenu mousedown", function(e) {
 					var evt = e;
 					$(this).mouseup( function(e) {
 						var srcElement = $(this);
 						srcElement.unbind('mouseup');
-						if( evt.button === 2 || o.allowLeft) {
+						if( evt.button === 2 || o.allowLeft || evt.type === "contextmenu" ) {
 							e.stopPropagation();
 							// Hide context menus that may be showing
 							$(".contextMenu").hide();
diff --git a/editor/svg-editor.html b/editor/svg-editor.html
index 5cad70c7..8dce445a 100644
--- a/editor/svg-editor.html
+++ b/editor/svg-editor.html
@@ -21,11 +21,11 @@
 <script type="text/javascript" src="svgicons/jquery.svgicons.js"></script>
 <script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script>
 <script type="text/javascript" src="spinbtn/JQuerySpinBtn.min.js"></script>
-<script type="text/javascript" src="contextmenu/jquery.contextMenu.min.js"></script>
 
 <!--{if svg_edit_release}>
   <script type="text/javascript" src="svgedit.compiled.js"></script>
 <!{else}-->
+  <script type="text/javascript" src="contextmenu/jquery.contextMenu.js"></script>
   <script type="text/javascript" src="browser.js"></script>
   <script type="text/javascript" src="svgtransformlist.js"></script>
   <script type="text/javascript" src="math.js"></script>