diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index c94e6d9f806..8c20d8b024d 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -1,12 +1,4 @@
 <idea-plugin version="2">
-    <actions>
-        <action id="NextSelectorParameter" class="org.jetbrains.jet.plugin.completion.NextPrevParameterAction$Next" text="Next Parameter">
-            <keyboard-shortcut first-keystroke="ctrl alt TAB" keymap="$default"/>
-        </action>
-        <action id="PrevSelectorParameter" class="org.jetbrains.jet.plugin.completion.NextPrevParameterAction$Prev" text="Previous Parameter">
-            <keyboard-shortcut first-keystroke="ctrl alt shift TAB" keymap="$default"/>
-        </action>
-    </actions>
   <name>Kotlin</name>
   <description>Kotlin language support</description>
   <version>@snapshot@</version>
@@ -73,6 +65,8 @@
       <lang.findUsagesProvider language="jet" implementationClass="org.jetbrains.jet.plugin.findUsages.JetFindUsagesProvider"/>
       <lang.refactoringSupport language="jet" implementationClass="org.jetbrains.jet.plugin.refactoring.JetRefactoringSupportProvider"/>
 
+      <templateParameterTraversalPolicy implementation="org.jetbrains.jet.plugin.completion.JetTemplateParameterTraversalPolicy"/>
+
       <codeInsight.parameterInfo language="jet" implementationClass="org.jetbrains.jet.plugin.parameterInfo.JetFunctionParameterInfoHandler"/>
 
       <completion.contributor language="jet" id="JetKeywordCompletionContributor" order="first"
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/JetTemplateParameterTraversalPolicy.java b/idea/src/org/jetbrains/jet/plugin/completion/JetTemplateParameterTraversalPolicy.java
new file mode 100644
index 00000000000..fae58f0bd15
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/completion/JetTemplateParameterTraversalPolicy.java
@@ -0,0 +1,90 @@
+package org.jetbrains.jet.plugin.completion;
+
+import com.intellij.codeInsight.completion.TemplateParameterTraversalPolicy;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.editor.ScrollType;
+import com.intellij.openapi.editor.SelectionModel;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.util.PsiTreeUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.lang.psi.JetFile;
+import org.jetbrains.jet.lexer.JetToken;
+import org.jetbrains.jet.lexer.JetTokens;
+
+/**
+ * @author Evgeny Gerashchenko
+ * @since 2/10/12
+ */
+public class JetTemplateParameterTraversalPolicy implements TemplateParameterTraversalPolicy {
+    @Override
+    public boolean isValidForFile(Editor editor, PsiFile file) {
+        return file instanceof JetFile;
+    }
+
+    @Override
+    public void invoke(Editor editor, PsiFile file, boolean next) {
+        Project project = editor.getProject();
+        if (project == null) {
+            return;
+        }
+        PsiDocumentManager.getInstance(project).commitAllDocuments();
+
+        JetToken terminatingToken = next ? JetTokens.IDE_TEMPLATE_START : JetTokens.IDE_TEMPLATE_END;
+
+        SelectionModel selModel = editor.getSelectionModel();
+        PsiElement first = file.findElementAt((selModel.getSelectionStart() + selModel.getSelectionEnd()) / 2);
+        PsiElement current = first;
+        if (first != null) {
+            do {
+                if (current.getNode().getElementType() == terminatingToken) {
+                    selectTemplate(editor, selModel, current, next);
+                    return;
+                }
+
+                current = goToNextPrevElement(current, next);
+            } while (current != first);
+        }
+    }
+
+    @NotNull
+    private static PsiElement goToNextPrevElement(@NotNull PsiElement element, boolean next) {
+        if (next) {
+            PsiElement nextLeaf = PsiTreeUtil.nextLeaf(element);
+            if (nextLeaf == null) {
+                PsiElement root = PsiTreeUtil.getTopmostParentOfType(element, JetFile.class);
+                assert root != null;
+                return PsiTreeUtil.firstChild(root);
+            }
+            return nextLeaf;
+        } else {
+            PsiElement prevLeaf = PsiTreeUtil.prevLeaf(element);
+            if (prevLeaf == null) {
+                PsiElement root = PsiTreeUtil.getTopmostParentOfType(element, JetFile.class);
+                assert root != null;
+                return PsiTreeUtil.lastChild(root);
+            }
+            return prevLeaf;
+        }
+    }
+
+    private static void selectTemplate(Editor editor, SelectionModel selModel, PsiElement current, boolean next) {
+        PsiElement match = goToNextPrevElement(goToNextPrevElement(current, next), next);
+        JetToken expected = next ? JetTokens.IDE_TEMPLATE_END : JetTokens.IDE_TEMPLATE_START;
+        if (expected != match.getNode().getElementType()) return;
+
+        int start = Math.min(current.getTextOffset(), match.getTextOffset());
+        int end = Math.max(current.getTextOffset() + current.getTextLength(),
+                           match.getTextOffset() + match.getTextLength());
+
+        editor.getCaretModel().moveToOffset(end);
+        editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
+
+        editor.getCaretModel().moveToOffset(start);
+        editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
+
+        selModel.setSelection(start, end);
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/completion/NextPrevParameterAction.java b/idea/src/org/jetbrains/jet/plugin/completion/NextPrevParameterAction.java
deleted file mode 100644
index 085b9fef380..00000000000
--- a/idea/src/org/jetbrains/jet/plugin/completion/NextPrevParameterAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package org.jetbrains.jet.plugin.completion;
-
-import com.intellij.codeInsight.CodeInsightActionHandler;
-import com.intellij.codeInsight.actions.CodeInsightAction;
-import com.intellij.openapi.editor.Editor;
-import com.intellij.openapi.editor.ScrollType;
-import com.intellij.openapi.editor.SelectionModel;
-import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.util.PsiTreeUtil;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetFile;
-import org.jetbrains.jet.lexer.JetToken;
-import org.jetbrains.jet.lexer.JetTokens;
-
-/**
- * @author Evgeny Gerashchenko
- * @author max (originally from objc)
- * @since 2/1/12
- */
-public abstract class NextPrevParameterAction extends CodeInsightAction {
-    private boolean myNext;
-
-    protected NextPrevParameterAction(boolean next) {
-        myNext = next;
-    }
-
-    @Override
-    protected CodeInsightActionHandler getHandler() {
-        return new Handler();
-    }
-
-    @Override
-    protected boolean isValidForFile(Project project, Editor editor, PsiFile file) {
-        return file instanceof JetFile;
-    }
-
-    @NotNull
-    private PsiElement goToNextPrevElement(@NotNull PsiElement element) {
-        if (myNext) {
-            PsiElement nextLeaf = PsiTreeUtil.nextLeaf(element);
-            if (nextLeaf == null) {
-                PsiElement root = PsiTreeUtil.getTopmostParentOfType(element, JetFile.class);
-                assert root != null;
-                return PsiTreeUtil.firstChild(root);
-            }
-            return nextLeaf;
-        } else {
-            PsiElement prevLeaf = PsiTreeUtil.prevLeaf(element);
-            if (prevLeaf == null) {
-                PsiElement root = PsiTreeUtil.getTopmostParentOfType(element, JetFile.class);
-                assert root != null;
-                return PsiTreeUtil.lastChild(root);
-            }
-            return prevLeaf;
-        }
-    }
-
-    private void selectTemplate(Editor editor, SelectionModel selModel, PsiElement current) {
-        PsiElement match = goToNextPrevElement(goToNextPrevElement(current));
-        JetToken expected = myNext ? JetTokens.IDE_TEMPLATE_END : JetTokens.IDE_TEMPLATE_START;
-        if (expected != match.getNode().getElementType()) return;
-
-        int start = Math.min(current.getTextOffset(), match.getTextOffset());
-        int end = Math.max(current.getTextOffset() + current.getTextLength(),
-                           match.getTextOffset() + match.getTextLength());
-
-        editor.getCaretModel().moveToOffset(end);
-        editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
-
-        editor.getCaretModel().moveToOffset(start);
-        editor.getScrollingModel().scrollToCaret(ScrollType.RELATIVE);
-
-        selModel.setSelection(start, end);
-    }
-
-    private class Handler implements CodeInsightActionHandler {
-        @Override
-        public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
-            PsiDocumentManager.getInstance(project).commitAllDocuments();
-
-            JetToken terminatingToken = myNext ? JetTokens.IDE_TEMPLATE_START : JetTokens.IDE_TEMPLATE_END;
-
-            SelectionModel selModel = editor.getSelectionModel();
-            PsiElement first = file.findElementAt((selModel.getSelectionStart() + selModel.getSelectionEnd()) / 2);
-            PsiElement current = first;
-            if (first != null) {
-                do {
-                    if (current.getNode().getElementType() == terminatingToken) {
-                        selectTemplate(editor, selModel, current);
-                        return;
-                    }
-
-                    current = goToNextPrevElement(current);
-                } while (current != first);
-            }
-        }
-
-        @Override
-        public boolean startInWriteAction() {
-            return false;
-        }
-    }
-
-    public static class Next extends NextPrevParameterAction {
-        public Next() {
-            super(true);
-        }
-    }
-
-    public static class Prev extends NextPrevParameterAction {
-        public Prev() {
-            super(false);
-        }
-    }
-}