diff --git a/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c b/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
index 85a93042f1d..ed3bfaa1108 100644
--- a/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
+++ b/jdk/src/java.desktop/unix/native/libsplashscreen/splashscreen_sys.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -281,9 +281,7 @@ SplashCreateWindow(Splash * splash) {
 /* for changing the visible shape of a window to an nonrectangular form */
 void
 SplashUpdateShape(Splash * splash) {
-    if (!shapeSupported)
-        return;
-    if (!splash->maskRequired) {
+    if (splash->currentFrame < 0 || !shapeSupported || !splash->maskRequired) {
         return;
     }
     XShapeCombineRectangles(splash->display, splash->window, ShapeClip, 0, 0,
@@ -324,6 +322,10 @@ ByteOrderToX(int byteOrder) {
 
 void
 SplashRedrawWindow(Splash * splash) {
+    if (splash->currentFrame < 0) {
+        return;
+    }
+
     XImage *ximage;
 
     // making this method redraw a part of the image does not make