diff --git a/CHANGES b/CHANGES
index 3343b8316..bea511d18 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 CHANGES IN FLTK 1.1.7
 
 	- Documentation fixes (STR #648)
+	- The file chooser didn't always deactivate the OK
+	  button when necessary (STR #653)
 	- Image drawing on OSX changed the current drawing
 	  colors (STR #662)
 	- Fixed some compiler errors on WIN32 (STR #647)
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index b615fe1ca..a53d670b0 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -433,6 +433,8 @@ Fl_File_Chooser::fileListCB()
     // Activate the OK button as needed...
     if (!fl_filename_isdir(pathname) || (type_ & DIRECTORY))
       okButton->activate();
+    else
+      okButton->deactivate();
   }
 }