diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
index 3ffe0eb83..3082a9b8d 100644
--- a/PowerEditor/src/NppIO.cpp
+++ b/PowerEditor/src/NppIO.cpp
@@ -1782,7 +1782,7 @@ bool Notepad_plus::fileRename(BufferID id)
 
 		StringDlg strDlg;
 		generic_string title = _nativeLangSpeaker.getLocalizedStrFromID("tabrename-title", TEXT("Rename Current Tab"));
-		strDlg.init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), title.c_str(), staticName.c_str(), buf->getFileName(), 0, reservedChars.c_str(), true);
+		strDlg.init(_pPublicInterface->getHinst(), _pPublicInterface->getHSelf(), title.c_str(), staticName.c_str(), buf->getFileName(), langNameLenMax - 1, reservedChars.c_str(), true);
 
 		TCHAR *tabNewName = reinterpret_cast<TCHAR *>(strDlg.doDialog());
 		if (tabNewName)
diff --git a/PowerEditor/src/ScintillaComponent/UserDefineDialog.rc b/PowerEditor/src/ScintillaComponent/UserDefineDialog.rc
index c1f97fd24..c949f545a 100644
--- a/PowerEditor/src/ScintillaComponent/UserDefineDialog.rc
+++ b/PowerEditor/src/ScintillaComponent/UserDefineDialog.rc
@@ -244,7 +244,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSM
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     LTEXT           "STATIC :",IDC_STRING_STATIC,6,4,42,8,0,WS_EX_RIGHT
-    EDITTEXT        IDC_STRING_EDIT,49,2,88,14
+    EDITTEXT        IDC_STRING_EDIT,49,2,88,14,ES_AUTOHSCROLL
     PUSHBUTTON      "OK",IDOK,20,26,50,14
     PUSHBUTTON      "Cancel",IDCANCEL,87,26,50,14
 END