diff --git a/Engine/Formatter.cs b/Engine/Formatter.cs
index 5a93854c5..a6a25f0fb 100644
--- a/Engine/Formatter.cs
+++ b/Engine/Formatter.cs
@@ -47,6 +47,7 @@ public static string Format<TCmdlet>(
                 "PSAvoidUsingDoubleQuotesForConstantString",
                 "PSAvoidSemicolonsAsLineTerminators",
                 "PSAvoidExclaimOperator",
+                "PSAvoidTrailingWhitespace",
             };
 
             var text = new EditableText(scriptDefinition);
diff --git a/Rules/AvoidTrailingWhitespace.cs b/Rules/AvoidTrailingWhitespace.cs
index 47f576d5b..a7567d6e6 100644
--- a/Rules/AvoidTrailingWhitespace.cs
+++ b/Rules/AvoidTrailingWhitespace.cs
@@ -54,7 +54,7 @@ public IEnumerable<DiagnosticRecord> AnalyzeScript(Ast ast, string fileName)
                 }
 
                 int startColumnOfTrailingWhitespace = 1;
-                for (int i = line.Length - 2; i > 0; i--)
+                for (int i = line.Length - 2; i >= 0; i--)
                 {
                     if (line[i] != ' ' && line[i] != '\t')
                     {
diff --git a/Tests/Rules/AvoidTrailingWhitespace.tests.ps1 b/Tests/Rules/AvoidTrailingWhitespace.tests.ps1
index f130a77c5..e5a45f0d3 100644
--- a/Tests/Rules/AvoidTrailingWhitespace.tests.ps1
+++ b/Tests/Rules/AvoidTrailingWhitespace.tests.ps1
@@ -9,6 +9,9 @@ BeforeAll {
 
     $settings = @{
         IncludeRules = @($ruleName)
+        Rules = @{
+            $ruleName = @{}
+        }
     }
 }
 
@@ -34,4 +37,26 @@ Describe "AvoidTrailingWhitespace" {
         $violations = Invoke-ScriptAnalyzer -ScriptDefinition $def -Settings $settings
         Test-CorrectionExtentFromContent $def $violations 1 $Whitespace ''
     }
+
+    It 'Should be used by Invoke-Formatter, when in settings, replacing trailing <Type>' -TestCases $testCases {
+        param (
+            [string] $Whitespace
+        )
+        # Test also guards against regression where single-character lines, with trailing whitespace
+        # would be removed entirely. See issues #1757, #1992
+        $def = @"
+Function Get-Example {
+    'Example'$Whitespace
+}$Whitespace
+"@
+
+        $expected = @"
+Function Get-Example {
+    'Example'
 }
+"@
+        $formatted = Invoke-Formatter -ScriptDefinition $def -Settings $settings
+        $formatted | Should -Be $expected
+    }
+
+}
\ No newline at end of file