diff --git a/src/unix/joystick.cpp b/src/unix/joystick.cpp
index 5896e0450f..928e9f6fc9 100644
--- a/src/unix/joystick.cpp
+++ b/src/unix/joystick.cpp
@@ -192,7 +192,6 @@ void* wxJoystickThread::Entry()
         }
     }
 
-    close(m_device);
     return NULL;
 }
 
@@ -231,7 +230,8 @@ wxJoystick::~wxJoystick()
     ReleaseCapture();
     if (m_thread)
         m_thread->Delete();  // It's detached so it will delete itself
-    m_device = -1;
+    if (m_device != -1)
+        close(m_device);
 }