diff --git a/src/Edit.c b/src/Edit.c
index 5ff5ebef3..4811c9062 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -268,7 +268,7 @@ void EditSetNewText(HWND hwnd,char* lpstrText,DWORD cbText)
   UndoRedoActionMap(-1,NULL);
   SendMessage(hwnd,SCI_CLEARALL,0,0);
   SendMessage(hwnd,SCI_MARKERDELETEALL,(WPARAM)MARKER_NP3_BOOKMARK,0);
-  SendMessage(hwnd,SCI_SETSCROLLWIDTH, DEFAULT_SCROLL_WIDTH,0);
+  SendMessage(hwnd,SCI_SETSCROLLWIDTH, 1,0);
   SendMessage(hwnd,SCI_SETXOFFSET,0,0);
 
   FileVars_Apply(hwnd,&fvCurFile);
diff --git a/src/Edit.h b/src/Edit.h
index cf7525191..2549114a1 100644
--- a/src/Edit.h
+++ b/src/Edit.h
@@ -51,10 +51,6 @@ typedef struct _editfindreplace
 #define INDIC_NP3_MATCH_BRACE    2
 #define INDIC_NP3_BAD_BRACE      3
 
-// [pixel] auto calculate by SCI_SETSCROLLWIDTHTRACKING
-//#define DEFAULT_SCROLL_WIDTH (8*80)
-#define DEFAULT_SCROLL_WIDTH ((8*g_WinInfo.cx)/10)
-
 void  EditInitWordDelimiter(HWND);
 void  EditSetNewText(HWND,char*,DWORD);
 BOOL  EditConvertText(HWND,int,int,BOOL);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index d4a5599be..71e4097f9 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -1228,7 +1228,7 @@ void __fastcall InitializeSciEditCtrl(HWND hwndEditCtrl)
   SendMessage(hwndEditCtrl, SCI_SETPASTECONVERTENDINGS, TRUE, 0);
   SendMessage(hwndEditCtrl, SCI_SETMODEVENTMASK,/*SC_MODEVENTMASKALL*/SC_MOD_INSERTTEXT | SC_MOD_DELETETEXT | SC_MOD_CONTAINER, 0);
   SendMessage(hwndEditCtrl, SCI_USEPOPUP, FALSE, 0);
-  SendMessage(hwndEditCtrl, SCI_SETSCROLLWIDTH, DEFAULT_SCROLL_WIDTH, 0);
+  SendMessage(hwndEditCtrl, SCI_SETSCROLLWIDTH, 1, 0);
   SendMessage(hwndEditCtrl, SCI_SETSCROLLWIDTHTRACKING, TRUE, 0);
   SendMessage(hwndEditCtrl, SCI_SETENDATLASTLINE, TRUE, 0);
   SendMessage(hwndEditCtrl, SCI_SETMOUSESELECTIONRECTANGULARSWITCH, TRUE, 0);
@@ -5612,7 +5612,7 @@ LRESULT MsgNotify(HWND hwnd,WPARAM wParam,LPARAM lParam)
 
 
         case SCN_SAVEPOINTREACHED:
-          SendMessage(g_hwndEdit, SCI_SETSCROLLWIDTH, DEFAULT_SCROLL_WIDTH, 0);
+          SendMessage(g_hwndEdit, SCI_SETSCROLLWIDTH, 1, 0);
           SetDocumentModified(FALSE);
           break;
 
diff --git a/src/Styles.c b/src/Styles.c
index c0c416e9c..31b7e63b4 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -5468,6 +5468,9 @@ void Style_SetStyles(HWND hwnd, int iStyle, LPCWSTR lpszStyle)
 
   if (lstrlen(lpszStyle) == 0) { return; }
 
+  // reset horizontal scrollbar width
+  SendMessage(hwnd, SCI_SETSCROLLWIDTH, 1, 0);
+
   // Font
   if (Style_StrGetFont(lpszStyle, tch, COUNTOF(tch))) {
     if (lstrlen(tch) > 0) {