diff --git a/src/Edit.c b/src/Edit.c
index 7c9976079..d635a08a6 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -3884,7 +3884,7 @@ void EditStripLastCharacter(HWND hwnd, bool bIgnoreSelection, bool bTrailingBlan
 {
   UNUSED(hwnd);
 
-  if (SciCall_IsSelectionEmpty() && !bIgnoreSelection) { return; }
+  if (SciCall_IsSelectionEmpty() && !(bIgnoreSelection || bTrailingBlanksOnly)) { return; }
 
   DocPos const iSelStart = (SciCall_IsSelectionEmpty() || bIgnoreSelection) ? 0 : SciCall_GetSelectionStart();
   DocPos const iSelEnd = (SciCall_IsSelectionEmpty() || bIgnoreSelection) ? Sci_GetDocEndPosition() : SciCall_GetSelectionEnd();
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 1dac20378..3646f5e54 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -4307,7 +4307,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
 
 
     case IDM_EDIT_PADWITHSPACES:
-      EditPadWithSpaces(Globals.hwndEdit,false,false);
+      EditPadWithSpaces(Globals.hwndEdit, false, false);
       break;