diff --git a/lib/ice-coder.js b/lib/ice-coder.js
index 9f283f5..f7d32e3 100644
--- a/lib/ice-coder.js
+++ b/lib/ice-coder.js
@@ -412,11 +412,22 @@ var ICEcoder = {
 
 	// Jump to and highlight the function definition current token
 	jumpToDefinition: function() {
-		var cM, tokenString;
+		var cM, tokenString, defVars;
 
 		cM = ICEcoder.getcMInstance();
 		tokenString = cM.getTokenAt(cM.getCursor()).string;
-		top.ICEcoder.findReplace("function "+tokenString,false,true);
+
+		if (cM.somethingSelected() && top.ICEcoder.origCurorPos) {
+			cM.setCursor(top.ICEcoder.origCurorPos);
+		} else {
+			top.ICEcoder.origCurorPos = cM.getCursor();
+			defVars = ["var "+tokenString, "function "+tokenString, tokenString+"=function", tokenString+"=new function", tokenString+":", "def "+tokenString, "class "+tokenString];
+			for (var i=0; i<defVars.length; i++) {
+				if (top.ICEcoder.findReplace(defVars[i],false,true)) {
+					i=defVars.length;
+				}
+			}
+		}
 	},
 
 // ==============
@@ -966,8 +977,10 @@ var ICEcoder = {
 					cM.focus();
 					top.ICEcoder.findMode = true;
 				}
+				return true;
 			} else {
 				results.innerHTML = "No results";
+				return false;
 			}
 		} else {
 			// Show the relevant multiple results popup