diff --git a/jme3-examples/src/main/java/jme3test/renderer/TestContextRestart.java b/jme3-examples/src/main/java/jme3test/renderer/TestContextRestart.java
new file mode 100644
index 0000000000..522aea951a
--- /dev/null
+++ b/jme3-examples/src/main/java/jme3test/renderer/TestContextRestart.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2009-2021 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package jme3test.renderer;
+
+import com.jme3.app.SimpleApplication;
+import com.jme3.input.KeyInput;
+import com.jme3.input.controls.ActionListener;
+import com.jme3.input.controls.KeyTrigger;
+import com.jme3.material.Material;
+import com.jme3.math.ColorRGBA;
+import com.jme3.scene.Geometry;
+import com.jme3.scene.shape.Box;
+import com.jme3.system.AppSettings;
+
+/**
+ * Tests how gamma correction works after a context restart.
+ *
+ * @author Markil 3
+ */
+public class TestContextRestart extends SimpleApplication implements ActionListener {
+    public static void main(String[] args) {
+        TestContextRestart app = new TestContextRestart();
+        AppSettings settings = new AppSettings(true);
+        settings.setGammaCorrection(true);
+        // Still need to see why setting this to anything higher than OPENGL2 causes the screen to blank in redisplay.
+//        settings.setRenderer(AppSettings.LWJGL_OPENGL32);
+        app.setSettings(settings);
+        app.start();
+    }
+
+    @Override
+    public void simpleInitApp() {
+        for (int i = 0, l = 256; i < l; i += 8) {
+            Geometry box = new Geometry("Box" + i, new Box(10, 200, 10));
+            Material mat = new Material(this.assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
+            mat.setColor("Color", new ColorRGBA((float) i / 255F, 0, 0, 1));
+            box.setMaterial(mat);
+            box.setLocalTranslation(-2.5F * (l / 2 - i), 0, -700);
+            this.rootNode.attachChild(box);
+        }
+
+        this.viewPort.setBackgroundColor(ColorRGBA.Yellow);
+
+        this.flyCam.setEnabled(false);
+        this.inputManager.setCursorVisible(true);
+
+        this.inputManager.addMapping("restart", new KeyTrigger(KeyInput.KEY_TAB));
+        this.inputManager.addListener(this, "restart");
+    }
+
+    @Override
+    public void onAction(String name, boolean isPressed, float tpf) {
+        if (!isPressed) {
+            // We need this in order to trigger the bug on jme3-lwjgl
+            this.settings.setSamples(8);
+            this.context.restart();
+        }
+    }
+}
diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java
index bbf02adacd..165b1578db 100644
--- a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java
+++ b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java
@@ -185,6 +185,8 @@ public void runLoop(){
                 logger.log(Level.SEVERE, "Failed to set display settings!", ex);
             }
             listener.reshape(settings.getWidth(), settings.getHeight());
+            // Re-enable gamma correction as needed
+            renderer.setMainFrameBufferSrgb(settings.isGammaCorrection());
             logger.fine("Display restarted.");
         } else if (Display.wasResized()) {
             int newWidth = Display.getWidth();
diff --git a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java
index 66515e9b78..1594a87b5b 100644
--- a/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java
+++ b/jme3-lwjgl3/src/main/java/com/jme3/system/lwjgl/LwjglWindow.java
@@ -577,6 +577,9 @@ private void restartContext() {
             LOGGER.log(Level.SEVERE, "Failed to set display settings!", ex);
         }
 
+        // Re-enable gamma correction
+        this.renderer.setMainFrameBufferSrgb(settings.isGammaCorrection());
+
         // We need to reinit the mouse and keyboard input as they are tied to a window handle
         if (keyInput != null && keyInput.isInitialized()) {
             keyInput.resetContext();