diff --git a/IDE/src/ui/FindResultsPanel.bf b/IDE/src/ui/FindResultsPanel.bf
index e53bb5dc..71f8891d 100644
--- a/IDE/src/ui/FindResultsPanel.bf
+++ b/IDE/src/ui/FindResultsPanel.bf
@@ -663,7 +663,7 @@ namespace IDE.ui
 						//for (int i = 0; i < data.mTextLength - mSearchOptions.mSearchString.Length; i++)
 						int i = 0;
 
-						while (i < data.mTextLength - mSearchOptions.mSearchString.Length)
+						while (i <= data.mTextLength - mSearchOptions.mSearchString.Length)
 						{
 							if ((isNewStart) || (!mSearchOptions.mMatchWholeWord))
 							{
@@ -710,7 +710,7 @@ namespace IDE.ui
 
 									editWidgetContent.PhysDeleteSelection(false);
 									editWidgetContent.PhysInsertAtCursor(mSearchOptions.mReplaceString, false);
-									i += mSearchOptions.mSearchString.Length - 1;
+									i += mSearchOptions.mReplaceString.Length - 1;
 									replaceCount++;
 									replaceInFileCount++;
 								}