--- old/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java	2015-09-03 14:51:31.917934000 -0700
+++ new/modules/controls/src/main/java/com/sun/javafx/scene/control/behavior/TwoLevelFocusListBehavior.java	2015-09-03 14:51:31.331900400 -0700
@@ -25,10 +25,12 @@
 
 package com.sun.javafx.scene.control.behavior;
 
+import com.sun.javafx.scene.control.Properties;
 import javafx.scene.Node;
 import javafx.scene.Parent;
 
 import javafx.scene.Scene;
+import javafx.scene.control.skin.ComboBoxPopupControl;
 import javafx.scene.input.KeyEvent;
 
 import javafx.beans.value.ChangeListener;
@@ -37,8 +39,6 @@
 import javafx.event.EventHandler;
 import javafx.scene.input.MouseEvent;
 
-import com.sun.javafx.scene.control.skin.ComboBoxPopupControl;
-
 public class TwoLevelFocusListBehavior extends TwoLevelFocusBehavior {
 
     public TwoLevelFocusListBehavior(Node node) {
@@ -190,7 +190,7 @@
                 */
                 Parent p = tlNode.getParent();
                 if (p != null) {
-                    if (ComboBoxPopupControl.COMBO_BOX_STYLE_CLASS.equals(p.getStyleClass().toString())) {
+                    if (Properties.COMBO_BOX_STYLE_CLASS.equals(p.getStyleClass().toString())) {
                         b = false;
                     }
                 }