diff --git a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/AccessoryCursorAdapter.java b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/AccessoryCursorAdapter.java
index 2a3432b..e4182d3 100644
--- a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/AccessoryCursorAdapter.java
+++ b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/AccessoryCursorAdapter.java
@@ -118,12 +118,6 @@ public class AccessoryCursorAdapter extends SimpleCursorAdapter {
         nameTextView.setText(name);
         nameTextView.setVisibility(View.VISIBLE);
 
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                availabilityCheckBox.toggle();
-            }
-        });
 
         availabilityCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -141,5 +135,11 @@ public class AccessoryCursorAdapter extends SimpleCursorAdapter {
             }
         });
 
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                availabilityCheckBox.toggle();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/CharacterCursorAdapter.java b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/CharacterCursorAdapter.java
index 0bd0e3d..4e45919 100644
--- a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/CharacterCursorAdapter.java
+++ b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/CharacterCursorAdapter.java
@@ -126,12 +126,6 @@ public class CharacterCursorAdapter extends SimpleCursorAdapter {
         separator.setVisibility(View.GONE);
 
 
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                availabilityCheckBox.toggle();
-            }
-        });
 
         availabilityCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -149,5 +143,11 @@ public class CharacterCursorAdapter extends SimpleCursorAdapter {
             }
         });
 
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                availabilityCheckBox.toggle();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/KartCursorAdapter.java b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/KartCursorAdapter.java
index 1f33f55..5a59066 100644
--- a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/KartCursorAdapter.java
+++ b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/KartCursorAdapter.java
@@ -130,12 +130,6 @@ public class KartCursorAdapter extends SimpleCursorAdapter {
                 = (TextView) view.findViewById(R.id.additional_info_second);
         dedicatedDriverTextView.setText(dedicatedDriver);
 
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                availabilityCheckBox.toggle();
-            }
-        });
 
         availabilityCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -153,5 +147,11 @@ public class KartCursorAdapter extends SimpleCursorAdapter {
             }
         });
 
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                availabilityCheckBox.toggle();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/TrackCursorAdapter.java b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/TrackCursorAdapter.java
index 08049b1..0c0e40d 100644
--- a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/TrackCursorAdapter.java
+++ b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/TrackCursorAdapter.java
@@ -128,12 +128,6 @@ public class TrackCursorAdapter extends SimpleCursorAdapter {
         final TextView numberTextView = (TextView) view.findViewById(R.id.additional_info_second);
         numberTextView.setText(number);
 
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                availabilityCheckBox.toggle();
-            }
-        });
 
         availabilityCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -151,5 +145,11 @@ public class TrackCursorAdapter extends SimpleCursorAdapter {
             }
         });
 
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                availabilityCheckBox.toggle();
+            }
+        });
     }
 }
diff --git a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/WheelsCursorAdapter.java b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/WheelsCursorAdapter.java
index d230ec1..3fa48e2 100644
--- a/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/WheelsCursorAdapter.java
+++ b/app/src/main/java/com/de/aldo_apps/aldo/mariokartcircuitselector/adapters/WheelsCursorAdapter.java
@@ -118,12 +118,6 @@ public class WheelsCursorAdapter extends SimpleCursorAdapter {
         nameTextView.setText(name);
         nameTextView.setVisibility(View.VISIBLE);
 
-        view.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(final View view) {
-                availabilityCheckBox.toggle();
-            }
-        });
 
         availabilityCheckBox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -141,5 +135,11 @@ public class WheelsCursorAdapter extends SimpleCursorAdapter {
             }
         });
 
+        view.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View view) {
+                availabilityCheckBox.toggle();
+            }
+        });
     }
 }