diff --git a/app/src/main/java/org/pyload/android/client/fragments/SettingsFragment.java b/app/src/main/java/org/pyload/android/client/fragments/SettingsFragment.java
index 8c428c0..b45ae57 100644
--- a/app/src/main/java/org/pyload/android/client/fragments/SettingsFragment.java
+++ b/app/src/main/java/org/pyload/android/client/fragments/SettingsFragment.java
@@ -1,6 +1,8 @@
 package org.pyload.android.client.fragments;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Map;
 import java.util.Map.Entry;
 
@@ -148,8 +150,18 @@ public SettingsAdapter(pyLoadApp app) {
 		data = new ArrayList<Entry<String, ConfigSection>>();
 	}
 
+  class SettingsComparator
+    implements Comparator<Entry<String,ConfigSection>> {
+
+    @Override
+    public int compare(Entry<String, ConfigSection> lhs, Entry<String, ConfigSection> rhs) {
+      return lhs.getKey().compareTo(rhs.getKey());
+    }
+  }
+
 	public void setData(Map<String, ConfigSection> map) {
 		this.data = new ArrayList<Entry<String, ConfigSection>>(map.entrySet());
+		Collections.sort(data, new SettingsComparator());
 		notifyDataSetChanged();
 	}
 
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755