diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el
index a414f17795..4bb83c06c8 100644
--- a/misc/fuel/fuel-refactor.el
+++ b/misc/fuel/fuel-refactor.el
@@ -32,7 +32,13 @@
     (insert word)
     (indent-region begin (point))
     (set-mark (point))
-    (fuel-syntax--beginning-of-defun)
+    (let ((beg (save-excursion (fuel-syntax--beginning-of-defun) (point)))
+          (end (save-excursion
+                 (re-search-backward fuel-syntax--end-of-def-regex nil t)
+                 (forward-line 1)
+                 (skip-syntax-forward "-")
+                 (point))))
+      (goto-char (max beg end)))
     (open-line 1)
     (let ((start (point)))
       (insert ": " word " " stack-effect "\n" code " ;\n")