diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
index 0fd226b82b7e..6a19f8e4d40b 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/MethodUpDownUtil.java
@@ -38,7 +38,7 @@ public class MethodUpDownUtil {
   public static int[] getNavigationOffsets(PsiFile file, final int caretOffset) {
     for(MethodNavigationOffsetProvider provider: Extensions.getExtensions(MethodNavigationOffsetProvider.EP_NAME)) {
       final int[] offsets = provider.getMethodNavigationOffsets(file, caretOffset);
-      if (offsets != null) {
+      if (offsets != null && offsets.length > 0) {
         return offsets;
       }
     }
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java
index f96e2d3f107d..8a7fb89c60c1 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/MethodUpAction.java
@@ -21,6 +21,7 @@ import com.intellij.codeInsight.actions.BaseCodeInsightAction;
 import com.intellij.codeInsight.navigation.MethodUpHandler;
 import com.intellij.ide.structureView.StructureViewBuilder;
 import com.intellij.ide.structureView.TreeBasedStructureViewBuilder;
+import com.intellij.ide.structureView.impl.TemplateLanguageStructureViewBuilder;
 import com.intellij.lang.LanguageStructureViewBuilder;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -40,6 +41,6 @@ public class MethodUpAction extends BaseCodeInsightAction {
 
   static boolean checkValidForFile(final PsiFile file) {
     final StructureViewBuilder structureViewBuilder = LanguageStructureViewBuilder.INSTANCE.getStructureViewBuilder(file);
-    return structureViewBuilder instanceof TreeBasedStructureViewBuilder;
+    return structureViewBuilder instanceof TreeBasedStructureViewBuilder || structureViewBuilder instanceof TemplateLanguageStructureViewBuilder;
   }
 }
\ No newline at end of file