diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/AssignmentSequenceJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/AssignmentSequenceJoinLinesHandler.java
index 48ed6aa45daf..8df96a2e2336 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/AssignmentSequenceJoinLinesHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/AssignmentSequenceJoinLinesHandler.java
@@ -23,7 +23,7 @@ public class AssignmentSequenceJoinLinesHandler implements JoinLinesHandlerDeleg
   @Override
   public int tryJoinLines(@NotNull final Document document, @NotNull final PsiFile psiFile, final int start, final int end) {
     PsiJavaToken elementAtStartLineEnd = tryCast(psiFile.findElementAt(start), PsiJavaToken.class);
-    if (elementAtStartLineEnd == null) return CANNOT_JOIN;
+    if (elementAtStartLineEnd == null || !elementAtStartLineEnd.getTokenType().equals(JavaTokenType.SEMICOLON)) return CANNOT_JOIN;
     PsiElement firstElement = elementAtStartLineEnd.getParent();
     PsiExpression firstValue = null;
     PsiVariable variable = null;
diff --git a/java/java-impl/src/com/intellij/codeInsight/editorActions/ChainCallJoinLinesHandler.java b/java/java-impl/src/com/intellij/codeInsight/editorActions/ChainCallJoinLinesHandler.java
index 9f161fb9d695..24acbe121737 100644
--- a/java/java-impl/src/com/intellij/codeInsight/editorActions/ChainCallJoinLinesHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/editorActions/ChainCallJoinLinesHandler.java
@@ -25,7 +25,7 @@ public class ChainCallJoinLinesHandler implements JoinLinesHandlerDelegate {
   @Override
   public int tryJoinLines(@NotNull final Document document, @NotNull final PsiFile psiFile, final int start, final int end) {
     PsiJavaToken elementAtStartLineEnd = tryCast(psiFile.findElementAt(start), PsiJavaToken.class);
-    if (elementAtStartLineEnd == null) return CANNOT_JOIN;
+    if (elementAtStartLineEnd == null || !elementAtStartLineEnd.getTokenType().equals(JavaTokenType.SEMICOLON)) return CANNOT_JOIN;
     PsiExpressionStatement secondStatement = PsiTreeUtil.getParentOfType(psiFile.findElementAt(end), PsiExpressionStatement.class);
     if (secondStatement == null) return CANNOT_JOIN;
     PsiMethodCallExpression secondCall = tryCast(secondStatement.getExpression(), PsiMethodCallExpression.class);