diff --git a/APDE/src/main/java/com/calsignlabs/apde/BareSketchFile.java b/APDE/src/main/java/com/calsignlabs/apde/BareSketchFile.java
index 9046d08..af64949 100644
--- a/APDE/src/main/java/com/calsignlabs/apde/BareSketchFile.java
+++ b/APDE/src/main/java/com/calsignlabs/apde/BareSketchFile.java
@@ -20,7 +20,11 @@ public abstract class BareSketchFile {
 	 * @return the filename as it is saved (name + suffix)
 	 */
 	public String getFilename() {
-		return getTitle() + getSuffix();
+		if(getSuffix().equalsIgnoreCase(".java")&&getTitle().endsWith(getSuffix())) {
+			return getTitle();
+		} else {
+			return getTitle() + getSuffix();
+		}
 	}
 	
 	public boolean isPde() {