diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index 01fd5535..575236b9 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -1240,7 +1240,7 @@ string Notepad_plus::getLangDesc(LangType langType, bool shortDesc)
 		"NFO",						"MSDOS Style/ASCII Art",
 		"udf",						"User Define File",
 		"ASP",						"Active Server Pages script file",
-		"SQL",						"Structure Query Language file",
+		"SQL",						"Structured Query Language file",
 		"VB",						"Visual Basic file",
 		"JavaScript",				"JavaScript file",
 		"CSS",						"Cascade Style Sheets File",
@@ -1340,7 +1340,7 @@ void Notepad_plus::getApiFileName(LangType langType, string &fn)
 
 	case L_LISP : fn = "lisp"; break;
 
-	case L_SCHEME : fn = "sheme"; break;
+	case L_SCHEME : fn = "scheme"; break;
 
 	case L_ASM :
         fn = "asm"; break;
@@ -3900,6 +3900,14 @@ void Notepad_plus::checkModifiedDocument()
 					else
 						pDocTabArray[j]->closeCurrentDoc();
 				}
+
+				if (_activeAppInf._isActivated)
+				{
+					int curPos = _pEditView->execute(SCI_GETCURRENTPOS);
+					::PostMessage(_pEditView->getHSelf(), WM_LBUTTONUP, 0, 0);
+					::PostMessage(_pEditView->getHSelf(), SCI_SETSEL, curPos, curPos);
+					_activeAppInf._isActivated = false;
+				}
 			}
 	        
 			bool isReadOnly = pScintillaArray[j]->isCurrentBufReadOnly();
diff --git a/PowerEditor/src/ScitillaComponent/Buffer.h b/PowerEditor/src/ScitillaComponent/Buffer.h
index 2fa61a81..c889e8e0 100644
--- a/PowerEditor/src/ScitillaComponent/Buffer.h
+++ b/PowerEditor/src/ScitillaComponent/Buffer.h
@@ -290,18 +290,18 @@ public :
 			return NULL;
 		return l->_pCommentEnd;
 	};
-	/*
-    const Position& getPosition() const {
+
+    const Position & getPosition() const {
        return _pos;
-       }
-	   */
+    };
+
     LangType getLangType() const {
        return _lang;
-       }
+    };
 
     void setPosition(const Position& pos) {
        _pos = pos;
-       }
+    };
 
 private :
 	bool _isDirty;
diff --git a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
index bc93340f..836740ec 100644
--- a/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
+++ b/PowerEditor/src/ScitillaComponent/FindReplaceDlg.rc
@@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 IDD_FIND_REPLACE_DLG DIALOGEX 36, 44, 321, 179
 //STYLE DS_3DLOOK | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_POPUP | WS_CAPTION | WS_SYSMENU
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW
 
 CAPTION "Replace"