diff --git a/src/extension.ts b/src/extension.ts
index 414ffa2a1..fe941b584 100644
--- a/src/extension.ts
+++ b/src/extension.ts
@@ -157,7 +157,13 @@ export async function activate(context: vscode.ExtensionContext): Promise<apiImp
             {
                 // Automatically continue roxygen comments: #'
                 action: { indentAction: vscode.IndentAction.None, appendText: '#\' ' },
-                beforeText: /^#'.*/,
+                beforeText: /^\s*#'\s*[^\s]/, // matches a non-empty roxygen line
+            },
+            {
+                // Automatically continue roxygen comments: #'
+                action: { indentAction: vscode.IndentAction.None, appendText: '#\' ' },
+                beforeText: /^\s*#'/, // matches any roxygen comment line, even an empty one
+                previousLineText: /^\s*([^#\s].*|#[^'\s].*|#'\s*[^\s].*|)$/, // matches everything but an empty roxygen line
             },
         ],
         wordPattern,