diff --git a/Source/OpenTK/Platform/DeviceCollection.cs b/Source/OpenTK/Platform/DeviceCollection.cs
index 804dac9db3..02e74923b4 100644
--- a/Source/OpenTK/Platform/DeviceCollection.cs
+++ b/Source/OpenTK/Platform/DeviceCollection.cs
@@ -46,7 +46,7 @@ class DeviceCollection<T> : IEnumerable<T>
 
         #region IEnumerable<T> Members
 
-        public IEnumerator<T> GetEnumerator()
+        IEnumerator<T> IEnumerable<T>.GetEnumerator()
         {
             return Devices.GetEnumerator();
         }
@@ -64,6 +64,17 @@ System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
 
         #region Public Members
 
+        // This avoids boxing when using foreach loops
+        public List<T>.Enumerator GetEnumerator()
+        {
+            return Devices.GetEnumerator();
+        }
+
+        public T this[int index]
+        {
+            get { return FromIndex(index); }
+        }
+
         /// \internal
         /// <summary>
         /// Adds or replaces a device based on its hardware id.