--- /dev/null	2015-09-03 15:16:02.000000000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/FakeFocusTextField.java	2015-09-03 15:16:00.978959400 -0700
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.sun.javafx.scene.control;
+
+import javafx.scene.AccessibleAttribute;
+import javafx.scene.control.TextField;
+
+public final class FakeFocusTextField extends TextField {
+
+    @Override public void requestFocus() {
+        if (getParent() != null) {
+            getParent().requestFocus();
+        }
+    }
+
+    public void setFakeFocus(boolean b) {
+        setFocused(b);
+    }
+
+    @Override
+    public Object queryAccessibleAttribute(AccessibleAttribute attribute, Object... parameters) {
+        switch (attribute) {
+            case FOCUS_ITEM:
+                /* Internally comboBox reassign its focus the text field.
+                 * For the accessibility perspective it is more meaningful
+                 * if the focus stays with the comboBox control.
+                 */
+                return getParent();
+            default: return super.queryAccessibleAttribute(attribute, parameters);
+        }
+    }
+}