diff --git a/app/main.cpp b/app/main.cpp
index e4ba06a8..a75afcdb 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -314,7 +314,7 @@ int main(int argc, char *argv[])
 
             if (!QFile("/dev/dri").exists()) {
                 qWarning() << "Unable to find a KMSDRM display device!";
-                qWarning() << "On Raspberry Pi 2 and 3, you must enable the 'fake KMS' driver in raspi-config to use Moonlight outside of the GUI environment.";
+                qWarning() << "On the Raspberry Pi, you must enable the 'fake KMS' driver in raspi-config to use Moonlight outside of the GUI environment.";
             }
         }
 #endif
@@ -435,10 +435,10 @@ int main(int argc, char *argv[])
     // Move the mouse to the bottom right so it's invisible when using
     // gamepad-only navigation.
     QCursor().setPos(0xFFFF, 0xFFFF);
-#elif defined(Q_OS_LINUX) && (defined(__arm__) || defined(__aarch64__))
+#elif !SDL_VERSION_ATLEAST(2, 0, 11) && defined(Q_OS_LINUX) && (defined(__arm__) || defined(__aarch64__))
     if (qgetenv("SDL_VIDEO_GL_DRIVER").isEmpty() && QGuiApplication::platformName() == "eglfs") {
-        // Look for Raspberry Pi GLES libraries. SDL needs some help finding the correct
-        // libraries for the KMSDRM backend if not compiled with the RPI backend enabled.
+        // Look for Raspberry Pi GLES libraries. SDL 2.0.10 and earlier needs some help finding
+        // the correct libraries for the KMSDRM backend if not compiled with the RPI backend enabled.
         if (SDL_LoadObject("libbrcmGLESv2.so") != nullptr) {
             qputenv("SDL_VIDEO_GL_DRIVER", "libbrcmGLESv2.so");
         }
diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index 7c605a2b..85327fdb 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -462,6 +462,7 @@ bool Session::initialize()
         break;
     }
 
+#if !SDL_VERSION_ATLEAST(2, 0, 11)
     // HACK: Using a full-screen window breaks mouse capture on the Pi's LXDE
     // GUI environment. Force the session to use windowed mode (which won't
     // really matter anyway because the MMAL renderer always draws full-screen).
@@ -470,6 +471,7 @@ bool Session::initialize()
                     "Forcing windowed mode on LXDE-Pi");
         m_FullScreenFlag = 0;
     }
+#endif
 
     // Check for validation errors/warnings and emit
     // signals for them, if appropriate