diff --git a/ChangeLog.md b/ChangeLog.md
index 7f846c5ed..bba986a59 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -12,6 +12,10 @@ IllegalComponentStateException if "Remote desktop size" was changed to "Auto"
 in the TurboVNC Viewer Options dialog while the viewer was actively receiving
 framebuffer updates from a VNC server.
 
+3. Fixed an issue whereby the "Reset all options to defaults" button in the
+TurboVNC Viewer Options dialog did not take into account the values specified
+in **~/.vnc/default.turbovnc**.
+
 
 3.2 beta1
 =========
diff --git a/java/com/turbovnc/vncviewer/OptionsDialog.java b/java/com/turbovnc/vncviewer/OptionsDialog.java
index ae4da36eb..6e9050cf3 100644
--- a/java/com/turbovnc/vncviewer/OptionsDialog.java
+++ b/java/com/turbovnc/vncviewer/OptionsDialog.java
@@ -837,6 +837,7 @@ public void actionPerformed(ActionEvent e) {
     } else if (s instanceof JButton && (JButton)s == resetButton) {
       Params oldParams = params;
       params = new Params();
+      params.loadDefaults();
       setOptions(desktopSize.isEnabled(), !shared.isEnabled(), false, false);
       params = oldParams;
     } else if (s instanceof JButton && (JButton)s == x509caButton) {