diff --git a/doc/fixes37.0 b/doc/fixes37.0
index b40f69fb0..c84c3a7b5 100644
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -578,6 +578,8 @@ monsters that drowned would never leave a corpse (holdover from decades ago
 give alternate message if hero is blind when throne gives "your vision clears"
 monster wearing an alchemy smock was only getting poison resistance from it,
 	not acid resistance; give both properties, just like for hero
+in wizard mode, knowing teleport away spell resulted in ^T always attempting
+	the spell instead of teleporting on demand
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository
diff --git a/src/teleport.c b/src/teleport.c
index f79ddd147..27e94290f 100644
--- a/src/teleport.c
+++ b/src/teleport.c
@@ -697,7 +697,7 @@ dotele(
         } else
             trap = 0;
     }
-    if (!trap) {
+    if (!trap && !break_the_rules) {
         boolean castit = FALSE;
         register int sp_no = 0, energy = 0;
 
@@ -737,7 +737,7 @@ dotele(
                the extra energy is spent even if that results in not
                having enough to cast (which also uses the move) */
             else if (u.uen < energy)
-                u.uen = energy;
+                energy = u.uen;
         } else if (u.uhunger <= 10) {
             cantdoit = "are too weak from hunger";
         } else if (ACURR(A_STR) < 4) {