diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index d0b67d7c..54e897ad 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -6273,6 +6273,8 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 			//Load initial docs into doctab
 			loadBufferIntoView(_mainEditView.getCurrentBufferID(), MAIN_VIEW);
 			loadBufferIntoView(_subEditView.getCurrentBufferID(), SUB_VIEW);
+			activateBuffer(_mainEditView.getCurrentBufferID(), MAIN_VIEW);
+			activateBuffer(_subEditView.getCurrentBufferID(), SUB_VIEW);
 			MainFileManager->increaseDocNr();	//so next doc starts at 2
 
 			::SetFocus(_mainEditView.getHSelf());
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
index d87a675b..8dbcfac7 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
@@ -953,7 +953,7 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
 	execute(SCI_SETUSETABS, !((NppParameters::getInstance())->getNppGUI())._tabReplacedBySpace);
 
 	int bitsNeeded = execute(SCI_GETSTYLEBITSNEEDED);
-	if (oldBits != bitsNeeded)
+	//if (oldBits != bitsNeeded)
 		execute(SCI_SETSTYLEBITS, bitsNeeded);
 }