diff --git a/mode/scala.py b/mode/scala.py
index bdd6e46..5e2849e 100644
--- a/mode/scala.py
+++ b/mode/scala.py
@@ -129,6 +129,7 @@ class ScalaTabber(StackTabber2):
     control_tokens     = {'scala.reserved': set(['if', 'else', 'while', 'do', 'for'])}
     case_tokens        = {'scala.reserved': set(['case'])}
     case_delim_tokens  = {'delimiter': set(['=>'])}
+    continue_tokens    = {'delimiter': set(['='])}
     end_at_eof         = True
     start_free_tokens  = {'string.start': 'string.end'}
     end_free_tokens    = {'string.end': 'string.start'}
diff --git a/tab.py b/tab.py
index e4dd0a0..54fa48b 100644
--- a/tab.py
+++ b/tab.py
@@ -433,6 +433,7 @@ class StackTabber2(Tabber):
 
         # if we don't want implicit continuation, return.
         if self.end_at_eof:
+            self._pop_while('continue', 'control', 'pre-control')
             return
 
         # ok, if we are closing a block then this will end a "single-statement"