diff --git a/mediarenderer/src/main/java/org/fourthline/cling/mediarenderer/MediaRendererController.java b/mediarenderer/src/main/java/org/fourthline/cling/mediarenderer/MediaRendererController.java
index af45ffc6b..ffff10002 100644
--- a/mediarenderer/src/main/java/org/fourthline/cling/mediarenderer/MediaRendererController.java
+++ b/mediarenderer/src/main/java/org/fourthline/cling/mediarenderer/MediaRendererController.java
@@ -38,6 +38,7 @@
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.util.Arrays;
 import java.util.logging.Level;
 
 public class MediaRendererController extends MainController {
@@ -118,14 +119,12 @@ public void run() {
                 MediaRenderer.APP.log(Level.INFO, "Initializing GStreamer backend and registering MediaRenderer device...");
 
                 try {
-                    fullscreenCheckbox.setSelected(
-                            args.length != 1 || !args[0].equals(ARG_USE_WINDOWS)
-                    );
-
                     // Pick a display method
-                    DisplayHandler displayHandler = args.length == 1 && args[0].equals(ARG_USE_WINDOWS)
-                            ? new WindowedDisplayHandler()
-                            : new FullscreenDisplayHandler();
+                    boolean fullscreen = args == null || !Arrays.asList(args).contains(ARG_USE_WINDOWS);
+                    fullscreenCheckbox.setSelected(fullscreen);
+                    DisplayHandler displayHandler = fullscreen
+                            ? new FullscreenDisplayHandler()
+                            : new WindowedDisplayHandler();
 
                     // Initialize the GStreamer backend (this also sets log level to WARNING for org.gstreamer)
                     Gst.init(MediaRenderer.APPNAME, args);
diff --git a/pom.xml b/pom.xml
index 755ff9146..ba48cdcd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,7 @@
         <ejb.api.version>3.0</ejb.api.version>
         <slf4j.version>1.7.12</slf4j.version>
         <jna.version>3.2.5</jna.version>
-        <gstreamer.version>1.4</gstreamer.version>
+        <gstreamer.version>1.5</gstreamer.version>
         <args4j.version>2.0.12</args4j.version>
         <weld.version>1.1.10.Final</weld.version>
         <javassist.version>3.19.0-GA</javassist.version>