diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
index 3c533d836b6b..d19584f4f3e3 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFxCompletionTest.java
@@ -217,6 +217,11 @@ public class JavaFxCompletionTest extends LightFixtureCompletionTestCase {
     doTest("ColumnConstraints");
   }
 
+  public void testEventHandlerMethod() throws Exception {
+    configureAndComplete("EventHandlerMethod.java", "EventHandlerMethodSuper.java");
+    assertSameElements(myFixture.getLookupElementStrings(), "onMyKeyTyped", "onSuperKeyTyped");
+  }
+
   public void testRawCollectionItem() throws Exception {
     configureAndComplete();
     assertDoesntContain(myFixture.getLookupElementStrings(), "T", "Object", "java.lang.Object");
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
index fc2ab665c1b4..c1b52557d8b1 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
@@ -57,7 +57,7 @@ public class JavaFxEventHandlerReference extends PsiReferenceBase<XmlAttributeVa
   public Object[] getVariants() {
     if (myController == null) return EMPTY_ARRAY;
     final List<PsiMethod> availableHandlers = new ArrayList<PsiMethod>();
-    for (PsiMethod psiMethod : myController.getMethods()) {
+    for (PsiMethod psiMethod : myController.getAllMethods()) {
       if (isHandlerMethodSignature(psiMethod) && JavaFxPsiUtil.isVisibleInFxml(psiMethod)) {
          availableHandlers.add(psiMethod);
        }
@@ -66,6 +66,8 @@ public class JavaFxEventHandlerReference extends PsiReferenceBase<XmlAttributeVa
   }
 
   public static boolean isHandlerMethodSignature(PsiMethod psiMethod) {
+    final PsiClass containingClass = psiMethod.getContainingClass();
+    if (containingClass != null && CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) return false;
     if (!psiMethod.hasModifierProperty(PsiModifier.STATIC)) {
       final PsiParameter[] parameters = psiMethod.getParameterList().getParameters();
       if (parameters.length == 1) {
diff --git a/plugins/javaFX/testData/completion/EventHandlerMethod.java b/plugins/javaFX/testData/completion/EventHandlerMethod.java
new file mode 100644
index 000000000000..df17f9ecce08
--- /dev/null
+++ b/plugins/javaFX/testData/completion/EventHandlerMethod.java
@@ -0,0 +1,8 @@
+import javafx.fxml.FXML;
+import javafx.scene.input.KeyEvent;
+
+public class EventHandlerMethod extends EventHandlerMethodSuper {
+    @FXML
+    private void onMyKeyTyped(KeyEvent event) {
+    }
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/EventHandlerMethodSuper.java b/plugins/javaFX/testData/completion/EventHandlerMethodSuper.java
new file mode 100644
index 000000000000..e568f04d4ab0
--- /dev/null
+++ b/plugins/javaFX/testData/completion/EventHandlerMethodSuper.java
@@ -0,0 +1,8 @@
+import javafx.fxml.FXML;
+import javafx.scene.input.KeyEvent;
+
+public class EventHandlerMethodSuper {
+    @FXML
+    private void onSuperKeyTyped(KeyEvent event) {
+    }
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/completion/eventHandlerMethod.fxml b/plugins/javaFX/testData/completion/eventHandlerMethod.fxml
new file mode 100644
index 000000000000..3a02a54b15be
--- /dev/null
+++ b/plugins/javaFX/testData/completion/eventHandlerMethod.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.VBox?>
+<VBox xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/null" fx:controller="EventHandlerMethod">
+    <TextField onKeyTyped="#<caret>"/>
+</VBox>