diff --git a/Source/OpenTK/Input/Keyboard.cs b/Source/OpenTK/Input/Keyboard.cs
index 104a92fd..f2838c9f 100644
--- a/Source/OpenTK/Input/Keyboard.cs
+++ b/Source/OpenTK/Input/Keyboard.cs
@@ -40,28 +40,38 @@ namespace OpenTK.Input
 
         static readonly IKeyboardDriver driver =
             Platform.Factory.Default.CreateKeyboardDriver();
+        static readonly object SyncRoot = new object();
 
         #endregion
 
         #region Public Members
 
         /// <summary>
-        /// Retrieves the KeyboardState for the default keyboard device.
+        /// Retrieves the combined <see cref="OpenTK.Input.KeyboardState"/> for all keyboard devices.
         /// </summary>
-        /// <returns>A <see cref="OpenTK.Input.KeyboardState"/> structure containing the state of the keyboard device.</returns>
+        /// <returns>A <see cref="OpenTK.Input.KeyboardState"/> structure containing the combined state for all keyboard devices.</returns>
         public static KeyboardState GetState()
         {
-            return driver.GetState();
+            lock (SyncRoot)
+            {
+                return driver.GetState();
+            }
         }
 
         /// <summary>
-        /// Retrieves the KeyboardState for the specified keyboard device.
+        /// Retrieves the <see cref="OpenTK.Input.KeyboardState"/> for the specified keyboard device.
         /// </summary>
         /// <param name="index">The index of the keyboard device.</param>
         /// <returns>A <see cref="OpenTK.Input.KeyboardState"/> structure containing the state of the keyboard device.</returns>
         public static KeyboardState GetState(int index)
         {
-            return driver.GetState(index);
+            if (index < 0)
+                throw new ArgumentOutOfRangeException("index");
+
+            lock (SyncRoot)
+            {
+                return driver.GetState(index);
+            }
         }
 
         #endregion
diff --git a/Source/OpenTK/Input/Mouse.cs b/Source/OpenTK/Input/Mouse.cs
index e8239e97..0747339f 100644
--- a/Source/OpenTK/Input/Mouse.cs
+++ b/Source/OpenTK/Input/Mouse.cs
@@ -40,30 +40,38 @@ namespace OpenTK.Input
 
         static readonly IMouseDriver driver =
             Platform.Factory.Default.CreateMouseDriver();
+        static readonly object SyncRoot = new object();
 
         #endregion
 
         #region Public Members
 
         /// <summary>
-        /// Retrieves the MouseState for the specified mouse device.
+        /// Retrieves the combined <see cref="OpenTK.Input.MouseState"/> for all specified mouse devices.
         /// </summary>
-        /// <returns>A <see cref="OpenTK.Input.MouseState"/> structure containing the state of the mouse device.</returns>
+        /// <returns>A <see cref="OpenTK.Input.MouseState"/> structure containing the combined state of all mouse devices.</returns>
         public static MouseState GetState()
         {
-            return driver.GetState();
+            lock (SyncRoot)
+            {
+                return driver.GetState();
+            }
         }
 
         /// <summary>
-        /// Retrieves the MouseState for the specified mouse device.
+        /// Retrieves the <see cref="OpenTK.Input.MouseState"/> for the specified mouse device.
         /// </summary>
         /// <param name="index">The index of the mouse device.</param>
-        /// <returns>A <see cref="OpenTK.Input.MouseState"/> structure containing the state of the mouse device.</returns>
+        /// <returns>A <see cref="OpenTK.Input.MouseState"/> structure containing the state for the specified mouse device.</returns>
         public static MouseState GetState(int index)
         {
             if (index < 0)
                 throw new ArgumentOutOfRangeException("index");
-            return driver.GetState(index);
+
+            lock (SyncRoot)
+            {
+                return driver.GetState(index);
+            }
         }
 
         #endregion