diff --git a/PowerEditor/src/Notepad_plus_Window.cpp b/PowerEditor/src/Notepad_plus_Window.cpp
index b089b60ea..4dc4ad1a3 100644
--- a/PowerEditor/src/Notepad_plus_Window.cpp
+++ b/PowerEditor/src/Notepad_plus_Window.cpp
@@ -124,7 +124,13 @@ void Notepad_plus_Window::init(HINSTANCE hInst, HWND parent, const TCHAR *cmdLin
 	
 	if (cmdLineParams->_isNoTab || (nppGUI._tabStatus & TAB_HIDE))
 	{
+		const int tabStatusOld = nppGUI._tabStatus;
 		::SendMessage(_hSelf, NPPM_HIDETABBAR, 0, TRUE);
+		if (cmdLineParams->_isNoTab)
+		{
+			// Restore old settings when tab bar has been hidden from tab bar.
+			nppGUI._tabStatus = tabStatusOld;
+		}
 	}
 
 	if (cmdLineParams->_alwaysOnTop)