diff --git a/diylc/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java b/diylc/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java
index 5890df34..59d44385 100644
--- a/diylc/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java
+++ b/diylc/diylc-swing/src/org/diylc/swing/gui/DialogFactory.java
@@ -158,7 +158,7 @@ public class DialogFactory {
     if (result == JFileChooser.APPROVE_OPTION) {
       lastDirectory = fileChooser.getCurrentDirectory();
       ConfigurationManager.getInstance().writeValue(PATH_KEY, lastDirectory.getAbsolutePath());
-      if (fileChooser.getSelectedFile().getAbsolutePath().contains(".")) {
+      if (fileChooser.getSelectedFile().getName().contains(".")) {
         return fileChooser.getSelectedFile();
       } else {
         return new File(fileChooser.getSelectedFile().getAbsoluteFile() + "." + defaultExtension);
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 800b7acc..7fb85d27 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -1890,6 +1890,10 @@
 					<changeType>IMPROVEMENT</changeType>
 					<description>Preserve z-order of components when copy-pasting</description>
 				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>BUG_FIX</changeType>
+					<description>File chooser dialogs don't append file extension if folder path has a dot character in it</description>
+				</org.diylc.appframework.update.Change>
 				<org.diylc.appframework.update.Change>
 					<changeType>BUG_FIX</changeType>
 					<description>"Cut Line" component sometimes disappears</description>