diff --git a/jadx-core/src/main/java/jadx/api/Decompiler.java b/jadx-core/src/main/java/jadx/api/Decompiler.java
index 9acc7cdd0..bb2b80740 100644
--- a/jadx-core/src/main/java/jadx/api/Decompiler.java
+++ b/jadx-core/src/main/java/jadx/api/Decompiler.java
@@ -16,6 +16,7 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -89,6 +90,14 @@ public final class Decompiler {
 			packages.add(new JavaPackage(entry.getKey(), entry.getValue()));
 		}
 		Collections.sort(packages);
+		for (JavaPackage pkg : packages) {
+			Collections.sort(pkg.getClasses(), new Comparator<JavaClass>() {
+				@Override
+				public int compare(JavaClass o1, JavaClass o2) {
+					return o1.getShortName().compareTo(o2.getShortName());
+				}
+			});
+		}
 		return Collections.unmodifiableList(packages);
 	}
 
diff --git a/jadx-core/src/main/java/jadx/api/JavaClass.java b/jadx-core/src/main/java/jadx/api/JavaClass.java
index e07c551e8..0d95fcb7d 100644
--- a/jadx-core/src/main/java/jadx/api/JavaClass.java
+++ b/jadx-core/src/main/java/jadx/api/JavaClass.java
@@ -8,6 +8,7 @@ import jadx.core.dex.nodes.MethodNode;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 public final class JavaClass {
@@ -54,6 +55,12 @@ public final class JavaClass {
 					mths.add(new JavaMethod(m));
 				}
 			}
+			Collections.sort(mths, new Comparator<JavaMethod>() {
+				@Override
+				public int compare(JavaMethod o1, JavaMethod o2) {
+					return o1.getName().compareTo(o2.getName());
+				}
+			});
 			this.methods = Collections.unmodifiableList(mths);
 		}
 	}