diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 512dd22192..7f65e49ce1 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -233335,10 +233335,6 @@ private:
 
 			if (! totalArea.isEmpty())
 			{
-#if JUCE_USE_XSHM
-				shmCompletedDrawing = false;
-#endif
-
 				if (image == 0 || image->getWidth() < totalArea.getWidth()
 					 || image->getHeight() < totalArea.getHeight())
 				{
@@ -233368,6 +233364,9 @@ private:
 
 				for (RectangleList::Iterator i (originalRepaintRegion); i.next();)
 				{
+#if JUCE_USE_XSHM
+					shmCompletedDrawing = false;
+#endif
 					const Rectangle<int>& r = *i.getRectangle();
 
 					image->blitToWindow (peer->windowH,
diff --git a/src/native/linux/juce_linux_Windowing.cpp b/src/native/linux/juce_linux_Windowing.cpp
index b0fbfd9a6a..02e12a0e80 100644
--- a/src/native/linux/juce_linux_Windowing.cpp
+++ b/src/native/linux/juce_linux_Windowing.cpp
@@ -1833,10 +1833,6 @@ private:
 
             if (! totalArea.isEmpty())
             {
-#if JUCE_USE_XSHM
-                shmCompletedDrawing = false;
-#endif
-
                 if (image == 0 || image->getWidth() < totalArea.getWidth()
                      || image->getHeight() < totalArea.getHeight())
                 {
@@ -1866,6 +1862,9 @@ private:
 
                 for (RectangleList::Iterator i (originalRepaintRegion); i.next();)
                 {
+#if JUCE_USE_XSHM
+                    shmCompletedDrawing = false;
+#endif
                     const Rectangle<int>& r = *i.getRectangle();
 
                     image->blitToWindow (peer->windowH,