--- Shipped Packages/Java/JavaProperties.sublime-syntax 2018-03-29 12:10:14
+++ Packages/Java/JavaProperties.sublime-syntax 2018-05-29 10:41:34
@@ -28,23 +28,29 @@
       set:
         - match: '[:=]'
           scope: punctuation.separator.java-props
           set: property-value
         - include: property-value
-      with_prototype:
+      #with_prototype:
         - match: (?=\n)
           pop: true
 
   property-value:
     - match: (?=\S)
       set:
         - meta_content_scope: string.unquoted.java-props
         - include: backslash
+    
+    - match: (?=\n)
+      pop: true
 
   backslash:
     - match: (\\)\n
       captures:
         1: punctuation.separator.continuation.java-props
     - match: \\u[[:xdigit:]]{4}
       scope: constant.character.escape.unicode.java-props
     - match: \\[^u]
       scope: constant.character.escape.java-props
+    
+    - match: (?=\n)
+      pop: true

diff --git a/src/parsing/parser.rs b/src/parsing/parser.rs
index da747bf..7f482e9 100644
--- a/src/parsing/parser.rs
+++ b/src/parsing/parser.rs
@@ -595,11 +595,11 @@ impl ParseState {
 
     /// Returns true if the stack was changed
     fn perform_op(&mut self, line: &str, regions: &Region, pat: &MatchPattern) -> bool {
-        let ctx_refs = match pat.operation {
-            MatchOperation::Push(ref ctx_refs) => ctx_refs,
+        let (ctx_refs, old_proto) = match pat.operation {
+            MatchOperation::Push(ref ctx_refs) => (ctx_refs, None),
             MatchOperation::Set(ref ctx_refs) => {
-                self.stack.pop();
-                ctx_refs
+                let old_proto = self.stack.pop().and_then(|s| s.prototype);
+                (ctx_refs, old_proto)
             }
             MatchOperation::Pop => {
                 self.stack.pop();
@@ -613,7 +613,9 @@ impl ParseState {
             // top most on the stack after all the contexts are pushed - this is also
             // referred to as the "target" of the push by sublimehq - see
             // https://forum.sublimetext.com/t/dev-build-3111/19240/17 for more info
-            let proto = if i == ctx_refs.len() - 1 {
+            let proto = if i == 0 && pat.with_prototype.is_none() {
+                old_proto.clone()
+            } else if i == ctx_refs.len() - 1 {
                 pat.with_prototype.clone()
             } else {
                 None