diff --git a/src/BWidgets/ChoiceBox.cpp b/src/BWidgets/ChoiceBox.cpp
index 84118da..0ad2955 100644
--- a/src/BWidgets/ChoiceBox.cpp
+++ b/src/BWidgets/ChoiceBox.cpp
@@ -193,6 +193,9 @@ void ChoiceBox::setValue (const double val)
 			}
 			++n;
 		}
+
+		ValueWidget::setValue (UNSELECTED);
+		activeNr = 0;
 	}
 }
 
diff --git a/src/BWidgets/FileChooser.cpp b/src/BWidgets/FileChooser.cpp
index f98d71d..2cccaf6 100644
--- a/src/BWidgets/FileChooser.cpp
+++ b/src/BWidgets/FileChooser.cpp
@@ -17,6 +17,7 @@
 
 #include "FileChooser.hpp"
 #include <dirent.h>
+#include <limits.h>
 #include <sys/stat.h>
 
 namespace BWidgets