diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index eba37ec11..d21f74622 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -4054,9 +4054,11 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask)
 	bool subActive = (_subEditView.getCurrentBuffer() == buffer);
 
 	//Only event that applies to non-active Buffers
-	if (mask & BufferChangeStatus) {	//reload etc
+	if (mask & BufferChangeStatus) 
+	{	//reload etc
 		bool didDialog = false;
-		switch(buffer->getStatus()) {
+		switch(buffer->getStatus()) 
+		{
 			case DOC_UNNAMED: 	//nothing todo
 			{
 				break;
@@ -4188,6 +4190,10 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask)
 		setDisplayFormat(buffer->getFormat());
 		enableConvertMenuItems(buffer->getFormat());
 	}
+
+	if (_pFileSwitcherPanel)
+		_pFileSwitcherPanel->setItemIconStatus((int)buffer);
+
 }
 
 void Notepad_plus::notifyBufferActivated(BufferID bufid, int view)
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 6505058d2..867bdfe37 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -847,8 +847,6 @@ void Notepad_plus::command(int id)
 		{
 			Buffer * buf = _pEditView->getCurrentBuffer();
 			buf->setUserReadOnly(!buf->getUserReadOnly());
-			if (_pFileSwitcherPanel)
-				_pFileSwitcherPanel->setItemIconStatus((int)buf);
 		}
 		break;
 
@@ -861,8 +859,6 @@ void Notepad_plus::command(int id)
 
 			::SetFileAttributes(buf->getFullPathName(), dwFileAttribs); 
 			buf->setFileReadOnly(false);
-			if (_pFileSwitcherPanel)
-				_pFileSwitcherPanel->setItemIconStatus((int)buf);
 		}
 		break;
 
diff --git a/PowerEditor/src/NppNotification.cpp b/PowerEditor/src/NppNotification.cpp
index c61fca5a4..5fcd40e3a 100644
--- a/PowerEditor/src/NppNotification.cpp
+++ b/PowerEditor/src/NppNotification.cpp
@@ -82,9 +82,6 @@ BOOL Notepad_plus::notify(SCNotification *notification)
 			}
 			bool isDirty = notification->nmhdr.code == SCN_SAVEPOINTLEFT;
 			buf->setDirty(isDirty);
-			if (_pFileSwitcherPanel)
-				_pFileSwitcherPanel->setItemIconStatus((int)buf);
-		
 			break; 
 		}