diff --git a/editor.php b/editor.php
index e57e9f3..719d46a 100644
--- a/editor.php
+++ b/editor.php
@@ -143,7 +143,7 @@ function createNewCMInstance(num) {
 		keyMap: "ICEcoder",
 		onKeyEvent: function(thisCM, e) {
 			top.ICEcoder.redoChangedContent(e);
-			top.ICEcoder.findReplace('find',true,false);
+			top.ICEcoder.findReplace(top.document.getElementById('find').value,true,false);
 			top.ICEcoder.getCaretPosition();
 			top.ICEcoder.updateCharDisplay();
 			tok = thisCM.getTokenAt(thisCM.getCursor());
diff --git a/index.php b/index.php
index 9eb9181..612554a 100644
--- a/index.php
+++ b/index.php
@@ -153,10 +153,10 @@ if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
 		?><div class="newTab" onClick="ICEcoder.newTab()" id="newTab"><img src="images/nav-new.png"></div>
 	</div>
 	<div id="findBar" class="findBar" onContextMenu="return false">
-		<form name="findAndReplace" onSubmit="ICEcoder.findReplace('findReplace',false,true);return false">
+		<form name="findAndReplace" onSubmit="ICEcoder.findReplace(top.document.getElementById('find').value,false,true);return false">
 			<div class="findReplace">
 				<div class="findText">Find</div>
-				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace('find',true,false)">
+				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace(top.document.getElementById('find').value,true,false)">
 				
 				<select name="connector" onChange="ICEcoder.findReplaceOptions()">
 				<option>in</option>