diff --git a/src/drivers/win/memwatch.cpp b/src/drivers/win/memwatch.cpp
index 8bf0ccb0..ce73a038 100644
--- a/src/drivers/win/memwatch.cpp
+++ b/src/drivers/win/memwatch.cpp
@@ -589,7 +589,6 @@ void CloseMemoryWatch()
 	{
 		SaveStrings();
 
-		//TODO: save window x,y and last file opened to some variables then save them to config when fceu closes
 		if (fileChanged==true)
 		{
 			if(MessageBox(hwndMemWatch, "Save Changes?", "Memory Watch Settings", MB_YESNO)==IDYES)
@@ -825,7 +824,7 @@ void CreateMemWatch()
 	}
 
 	//Create
-		hwndMemWatch=CreateDialog(fceu_hInstance,"MEMWATCH",NULL,MemWatchCallB);
+	hwndMemWatch=CreateDialog(fceu_hInstance,"MEMWATCH",NULL,MemWatchCallB);
 	memwmenu=GetMenu(hwndMemWatch);
 	UpdateMemWatch();
 	memwrecentmenu = CreateMenu();
diff --git a/src/drivers/win/replay.cpp b/src/drivers/win/replay.cpp
index 90256cc5..ad2765d1 100644
--- a/src/drivers/win/replay.cpp
+++ b/src/drivers/win/replay.cpp
@@ -215,7 +215,7 @@ void UpdateReplayDialog(HWND hwndDlg)
 		SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_RECORDEDFROM),"");
 		SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_EMULATORUSED),"");
 		SetWindowText(GetDlgItem(hwndDlg,IDC_LABEL_CURRCHECKSUM),md5_asciistr(GameInfo->MD5));
-		SetDlgItemText(hwndDlg,IDC_EDIT_STOPFRAME,"");
+		SetDlgItemText(hwndDlg,IDC_EDIT_STOPFRAME,""); stopframeWasEditedByUser=false;
 		EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_READONLY),FALSE);
 		SendDlgItemMessage(hwndDlg,IDC_CHECK_READONLY,BM_SETCHECK,BST_UNCHECKED,0);
 		EnableWindow(GetDlgItem(hwndDlg,IDOK),FALSE);
@@ -476,6 +476,7 @@ BOOL CALLBACK ReplayDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 				{
 				HWND hwnd1 = GetDlgItem(hwndDlg,IDC_CHECK_STOPMOVIE);
 				Button_SetCheck(hwnd1,BST_CHECKED);
+				stopframeWasEditedByUser = true;
 				}
 				else
 					stopframeWasEditedByUser = true;