diff --git a/src/common.h b/src/common.h
index 826982472..a1c2e0841 100644
--- a/src/common.h
+++ b/src/common.h
@@ -12,6 +12,9 @@
 #include <string.h>
 #include <termios.h>
 #include <wchar.h>
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
 
 #include <memory>
 #include <sstream>
diff --git a/src/fish_key_reader.cpp b/src/fish_key_reader.cpp
index e3b19a876..97bd22046 100644
--- a/src/fish_key_reader.cpp
+++ b/src/fish_key_reader.cpp
@@ -281,9 +281,9 @@ static void setup_and_process_keys(bool continuous_mode) {
     is_interactive_session = 1;  // by definition this program is interactive
     set_main_thread();
     setup_fork_guards();
+    proc_push_interactive(1);
     env_init();
     reader_init();
-    proc_push_interactive(1);
     install_our_signal_handlers();
 
     if (continuous_mode) {