diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
index 15287e66d91e4f4088b7bd601ab257a2eb5874e7..e956c344e8c4acbf2c0dc990d192f36e0ca79712 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/coresettings/network/NetworkBaseFragment.kt
@@ -218,6 +218,7 @@ abstract class NetworkBaseFragment : SettingsFragment(), SettingsFragment.Savabl
     customratelimitsEnabled.setDependent(customratelimitsGroup)
     customratelimitsUnlimited.setOnCheckedChangeListener { _, isChecked ->
       customratelimitsBurstSize.isEnabled = !isChecked
+      customratelimitsBurstSize.isEnabled = !isChecked
     }
 
     return view
diff --git a/app/src/main/res/layout/settings_network.xml b/app/src/main/res/layout/settings_network.xml
index fe264e3c763af2ff977e0f4e9ef6b88177825fb6..b0c0cf829330d40acb300eed6832f3f2ca4c8db0 100644
--- a/app/src/main/res/layout/settings_network.xml
+++ b/app/src/main/res/layout/settings_network.xml
@@ -302,6 +302,11 @@
       style="@style/Widget.CoreSettings.DependentGroup"
       tools:visibility="visible">
 
+      <android.support.v7.widget.SwitchCompat
+        android:id="@+id/customratelimits_unlimited"
+        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
+        android:text="@string/settings_network_customratelimits_unlimited" />
+
       <android.support.design.widget.TextInputLayout
         style="@style/Widget.CoreSettings.EditTextLayout"
         android:hint="@string/settings_network_customratelimits_burstsize">
@@ -312,11 +317,6 @@
           tools:text="5" />
       </android.support.design.widget.TextInputLayout>
 
-      <android.support.v7.widget.SwitchCompat
-        android:id="@+id/customratelimits_unlimited"
-        style="@style/Widget.CoreSettings.PrimaryItemSwitch"
-        android:text="@string/settings_network_customratelimits_unlimited" />
-
       <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">