diff --git a/PowerEditor/installer/nativeLang/english.xml b/PowerEditor/installer/nativeLang/english.xml
index 918cb2364..18d9fe614 100644
--- a/PowerEditor/installer/nativeLang/english.xml
+++ b/PowerEditor/installer/nativeLang/english.xml
@@ -1808,6 +1808,7 @@ Click on "?" button on right to open website with User Manual."/>
 			<npcIncludeCcUniEol-tip value="Apply non-printing characters appearance settings to C0, C1 control and Unicode EOL (next line, line separator and paragraph separator) characters."/>
 			<searchingInSelThresh-tip value="Number of selected characters in edit zone to automatically check the &quot;In selection&quot; checkbox when the Find dialog is activated. The maximum value is 1024. Set the value to 0 to disable auto-checking."/>
 			<verticalEdge-tip value="Add your column marker by indicating its position with a decimal number. You can define several column markers by using white space to separate the different numbers."/>
+			<fileSaveAsCopySaveButton-tip value="Hold Shift while pressing Save to open the copy after saving."/>
 			<autoIndentBasic-tip value="Ensure that the indentation of the current line (i.e. the new line created by pressing the ENTER key) matches the indentation of the previous line."/>
 			<autoIndentAdvanced-tip value="Enable smart indentation for &quot;C-like&quot; languages and Python. The &quot;C-like&quot; languages include:
 C, C++, Java, C#, Objective-C, PHP, JavaScript, JSP, CSS, Perl, Rust, PowerShell and JSON.
diff --git a/PowerEditor/installer/nativeLang/english_customizable.xml b/PowerEditor/installer/nativeLang/english_customizable.xml
index d6c2fc148..e16520e27 100644
--- a/PowerEditor/installer/nativeLang/english_customizable.xml
+++ b/PowerEditor/installer/nativeLang/english_customizable.xml
@@ -1807,6 +1807,7 @@ Click on &quot;?&quot; button on right to open website with User Manual."/>
 			<npcIncludeCcUniEol-tip value="Apply non-printing characters appearance settings to C0, C1 control and Unicode EOL (next line, line separator and paragraph separator) characters."/>
 			<searchingInSelThresh-tip value="Number of selected characters in edit zone to automatically check the &quot;In selection&quot; checkbox when the Find dialog is activated. The maximum value is 1024. Set the value to 0 to disable auto-checking."/>
 			<verticalEdge-tip value="Add your column marker by indicating its position with a decimal number. You can define several column markers by using white space to separate the different numbers."/>
+			<fileSaveAsCopySaveButton-tip value="Hold Shift while pressing Save to open the copy after saving."/>
 			<autoIndentBasic-tip value="Ensure that the indentation of the current line (i.e. the new line created by pressing the ENTER key) matches the indentation of the previous line."/>
 			<autoIndentAdvanced-tip value="Enable smart indentation for &quot;C-like&quot; languages and Python. The &quot;C-like&quot; languages include:
 C, C++, Java, C#, Objective-C, PHP, JavaScript, JSP, CSS, Perl, Rust, PowerShell and JSON.
diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index 3bb3d3eda..ac4d18af1 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -1812,6 +1812,8 @@ bool Notepad_plus::fileSaveAs(BufferID id, bool isSaveCopy)
 
 	fDlg.setExtIndex(langTypeIndex + 1); // +1 for "All types"
 
+	fDlg.setSaveAsCopy(isSaveCopy);
+
 	wstring localizedTitle;
 	if (isSaveCopy)
 	{
@@ -1862,6 +1864,15 @@ bool Notepad_plus::fileSaveAs(BufferID id, bool isSaveCopy)
 				_lastRecentFileList.remove(fn.c_str());
 			}
 
+			if (res && isSaveCopy && fDlg.getOpenTheCopyAfterSaveAsCopy())
+			{
+				BufferID bid = doOpen(fn.c_str());
+				if (bid != BUFFER_INVALID)
+				{
+					switchToFile(bid);
+				}
+			}
+
 			return res;
 		}
 		else		//cannot save, other view has buffer already open, activate it
diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp b/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
index 01d054e24..867dc94ce 100644
--- a/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
+++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.cpp
@@ -25,6 +25,7 @@
 #include <unordered_map>
 #include "CustomFileDialog.h"
 #include "Parameters.h"
+#include "localization.h"
 
 using namespace std;
 
@@ -54,6 +55,10 @@ namespace // anonymous
 	static const int IDC_FILE_CUSTOM_CHECKBOX = 4;
 	static const int IDC_FILE_TYPE_CHECKBOX = IDC_FILE_CUSTOM_CHECKBOX + 1;
 
+	static const unsigned char SAVE_AS_COPY_OPEN = 0x01;
+	static const unsigned char SAVE_AS_COPY_DLG = 0x02;
+
+
 	// Returns a first extension from the extension specification string.
 	// Multiple extensions are separated with ';'.
 	// Example: input - ".c;.cpp;.h", output - ".c"
@@ -365,15 +370,21 @@ public:
 		return E_NOTIMPL;
 	}
 
-	FileDialogEventHandler(IFileDialog* dlg, const std::vector<Filter>& filterSpec, int fileIndex, int wildcardIndex)
+	FileDialogEventHandler(IFileDialog* dlg, const std::vector<Filter>& filterSpec, int fileIndex, int wildcardIndex, bool isSaveAsCopy)
 		: _cRef(1), _dialog(dlg), _customize(dlg), _filterSpec(filterSpec), _currentType(fileIndex + 1),
-		_lastSelectedType(fileIndex + 1), _wildcardType(wildcardIndex >= 0 ? wildcardIndex + 1 : 0)
+		_lastSelectedType(fileIndex + 1), _wildcardType(wildcardIndex >= 0 ? wildcardIndex + 1 : 0),
+		_isSaveAsCopy(isSaveAsCopy)
 	{
 		installHooks();
 	}
 
 	~FileDialogEventHandler()
 	{
+		if (_hwndButtonTooltip)
+		{
+			DestroyWindow(_hwndButtonTooltip);
+			_hwndButtonTooltip = nullptr;
+		}
 		eraseHandles();
 		removeHooks();
 	}
@@ -396,7 +407,21 @@ private:
 		{
 			EnumChildWindows(hwndDlg, &EnumChildProc, reinterpret_cast<LPARAM>(this));
 			if (_hwndButton)
+			{
 				s_handleMap[_hwndButton] = this;
+				if (_isSaveAsCopy && !_hwndButtonTooltip)
+				{
+					NppParameters& nppParam = NppParameters::getInstance();
+					NativeLangSpeaker* pNativeSpeaker = nppParam.getNativeLangSpeaker();
+					wstring tipText = pNativeSpeaker->getLocalizedStrFromID("fileSaveAsCopySaveButton-tip",
+						L"Hold Shift while pressing Save to open the copy after saving.");
+					int ctrlId = GetDlgCtrlID(_hwndButton);
+					if (ctrlId != 0)
+					{
+						_hwndButtonTooltip = CreateToolTip(ctrlId, hwndDlg, 0, const_cast<LPWSTR>(tipText.c_str()), pNativeSpeaker->isRTL());
+					}
+				}
+			}
 			if (_hwndNameEdit)
 				s_handleMap[_hwndNameEdit] = this;
 		}
@@ -636,9 +661,11 @@ private:
 	HHOOK _prevCallHook = nullptr;
 	HWND _hwndNameEdit = nullptr;
 	HWND _hwndButton = nullptr;
+	HWND _hwndButtonTooltip = nullptr;
 	UINT _currentType = 0;  // File type currenly selected in dialog.
 	UINT _lastSelectedType = 0;  // Last selected non-wildcard file type.
 	UINT _wildcardType = 0;  // Wildcard *.* file type index (usually 1).
+	bool _isSaveAsCopy = false;
 };
 std::unordered_map<HWND, FileDialogEventHandler*> FileDialogEventHandler::s_handleMap;
 
@@ -670,7 +697,7 @@ public:
 		// Init the event handler.
 		// Pass the initially selected file type.
 		if (SUCCEEDED(hr))
-			_events.Attach(new FileDialogEventHandler(_dialog, _filterSpec, _fileTypeIndex, _wildcardIndex));
+			_events.Attach(new FileDialogEventHandler(_dialog, _filterSpec, _fileTypeIndex, _wildcardIndex, (_savingAsCopyInfo & SAVE_AS_COPY_DLG) != 0));
 
 		// If "assign type" is OFF, then change the file type to *.*
 		if (_enableFileTypeCheckbox && !_fileTypeCheckboxValue && _wildcardIndex >= 0)
@@ -803,6 +830,15 @@ public:
 			hr = _dialog->Show(_hwndOwner);
 			okPressed = SUCCEEDED(hr);
 
+			if (((_savingAsCopyInfo & SAVE_AS_COPY_DLG) != 0) && okPressed && ((GetKeyState(VK_SHIFT) & 0x8000) != 0))
+			{
+				_savingAsCopyInfo |= SAVE_AS_COPY_OPEN;
+			}
+			else
+			{
+				_savingAsCopyInfo &= ~SAVE_AS_COPY_OPEN;
+			}
+
 			NppParameters& params = NppParameters::getInstance();
 			NppGUI& nppGUI = params.getNppGUI();
 			if (nppGUI._openSaveDir == dir_last)
@@ -902,6 +938,7 @@ public:
 	bool _enableFileTypeCheckbox = false;
 	bool _fileTypeCheckboxValue = false;	// initial value
 	wstring _fileTypeCheckboxLabel;
+	unsigned char _savingAsCopyInfo = 0;
 
 private:
 	com_ptr<IFileDialog> _dialog;
@@ -989,6 +1026,23 @@ void CustomFileDialog::setExtIndex(int extTypeIndex)
 	_impl->_fileTypeIndex = extTypeIndex;
 }
 
+void CustomFileDialog::setSaveAsCopy(bool isSavingAsCopy)
+{
+	if (isSavingAsCopy)
+	{
+		_impl->_savingAsCopyInfo |= SAVE_AS_COPY_DLG;
+	}
+	else
+	{
+		_impl->_savingAsCopyInfo &= ~SAVE_AS_COPY_DLG;
+	}
+}
+
+bool CustomFileDialog::getOpenTheCopyAfterSaveAsCopy(void)
+{
+	return (_impl->_savingAsCopyInfo & SAVE_AS_COPY_OPEN) != 0;
+}
+
 bool CustomFileDialog::getCheckboxState() const
 {
 	return _impl->getCheckboxState(IDC_FILE_CUSTOM_CHECKBOX);
diff --git a/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.h b/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.h
index 1dbb839e3..977225169 100644
--- a/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.h
+++ b/PowerEditor/src/WinControls/OpenSaveFileDialog/CustomFileDialog.h
@@ -37,6 +37,8 @@ public:
 	void setFolder(const wchar_t* folder);
 	void setCheckbox(const wchar_t* text, bool isActive = true);
 	void setExtIndex(int extTypeIndex);
+	void setSaveAsCopy(bool isSavingAsCopy);
+	bool getOpenTheCopyAfterSaveAsCopy(void);
 
 	void enableFileTypeCheckbox(const std::wstring& text, bool value);
 	bool getFileTypeCheckboxValue() const;