diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index b00790f65..06c998485 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -4450,6 +4450,8 @@ void Notepad_plus::notifyBufferChanged(Buffer * buffer, int mask)
 
 	if (mask & (BufferChangeDirty|BufferChangeFilename))
 	{
+		if(mask & BufferChangeFilename)
+			command(IDM_VIEW_REFRESHTABAR);
 		checkDocState();
 		setTitle();
 		generic_string dir(buffer->getFullPathName());
diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index 7d761ad46..4c0432457 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -388,6 +388,7 @@ void Notepad_plus::doClose(BufferID id, int whichOne)
 				_pFileSwitcherPanel->closeItem((int)hiddenBufferID, whichOne);
 		}
 	}
+	command(IDM_VIEW_REFRESHTABAR);
 	return;
 }