diff --git a/jerry-core/parser/js/js-scanner.c b/jerry-core/parser/js/js-scanner.c
index df60a83cb..437e04367 100644
--- a/jerry-core/parser/js/js-scanner.c
+++ b/jerry-core/parser/js/js-scanner.c
@@ -713,7 +713,21 @@ scanner_scan_post_primary_expression (parser_context_t *context_p, /**< context
     case LEXER_INCREASE:
     case LEXER_DECREASE:
     {
-      return !(context_p->token.flags & LEXER_WAS_NEWLINE);
+      scanner_context_p->mode = SCAN_MODE_PRIMARY_EXPRESSION_END;
+
+      if (context_p->token.flags & LEXER_WAS_NEWLINE)
+      {
+        return false;
+      }
+
+      lexer_next_token (context_p);
+      type = (lexer_token_type_t) context_p->token.type;
+
+      if (type != LEXER_QUESTION_MARK)
+      {
+        break;
+      }
+      /* FALLTHRU */
     }
     case LEXER_QUESTION_MARK:
     {
@@ -2680,6 +2694,7 @@ scanner_scan_all (parser_context_t *context_p, /**< context */
           {
             break;
           }
+          type = (lexer_token_type_t) context_p->token.type;
           /* FALLTHRU */
         }
         case SCAN_MODE_PRIMARY_EXPRESSION_END:
diff --git a/tests/jerry/arithmetic-parse.js b/tests/jerry/arithmetic-parse.js
index 81e6c5fa1..6c60e8451 100644
--- a/tests/jerry/arithmetic-parse.js
+++ b/tests/jerry/arithmetic-parse.js
@@ -41,3 +41,6 @@ parse ("a =% b");
 
 parse ("c = a+");
 parse ("c = a-");
+
+parse("a++\n()")
+parse("a--\n.b")
diff --git a/tests/jerry/regression-test-issue-3397.js b/tests/jerry/regression-test-issue-3397.js
new file mode 100644
index 000000000..6d8389ecf
--- /dev/null
+++ b/tests/jerry/regression-test-issue-3397.js
@@ -0,0 +1,18 @@
+// Copyright JS Foundation and other contributors, http://js.foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+var $
+
+$++
+[ ]