diff --git a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java
index 9b7b9d3b..a106ece1 100644
--- a/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java
+++ b/app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java
@@ -22,6 +22,7 @@ public abstract class VirtualControllerElement extends View {
 
     protected int normalColor = 0xF0888888;
     protected int pressedColor = 0xF00000FF;
+    protected int configSelectedColor = 0xF000FF00;
 
     protected int startSize_x;
     protected int startSize_y;
@@ -71,12 +72,9 @@ public abstract class VirtualControllerElement extends View {
 
     @Override
     protected void onDraw(Canvas canvas) {
-        onElementDraw(canvas);
-
-        if (virtualController.getControllerMode() == VirtualController.ControllerMode.
-                Configuration) {
-            paint.setColor(pressedColor);
-            paint.setStrokeWidth(3);
+        if (currentMode != Mode.Normal) {
+            paint.setColor(configSelectedColor);
+            paint.setStrokeWidth(10);
             paint.setStyle(Paint.Style.STROKE);
 
             canvas.drawRect(0, 0,
@@ -84,6 +82,8 @@ public abstract class VirtualControllerElement extends View {
                     paint);
         }
 
+        onElementDraw(canvas);
+
         super.onDraw(canvas);
     }