diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82621d794b..cc0c8c6deb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@
     Bug #4384: Resist Normal Weapons only checks ammunition for ranged weapons
     Bug #4411: Reloading a saved game while falling prevents damage in some cases
     Bug #4540: Rain delay when exiting water
+    Bug #4639: Black screen after completing first mages guild mission + training
     Bug #4701: PrisonMarker record is not hardcoded like other markers
     Bug #4703: Editor: it's possible to preview levelled list records
     Bug #4705: Editor: unable to open exterior cell views from Instances table
diff --git a/apps/openmw/mwgui/screenfader.cpp b/apps/openmw/mwgui/screenfader.cpp
index e75e4954e4..619852a22b 100644
--- a/apps/openmw/mwgui/screenfader.cpp
+++ b/apps/openmw/mwgui/screenfader.cpp
@@ -38,12 +38,20 @@ namespace MWGui
         if (!mRunning)
             return;
 
-        if (mRemainingTime <= 0 || mStartAlpha == mTargetAlpha)
+        if (mStartAlpha == mTargetAlpha)
         {
             finish();
             return;
         }
 
+        if (mRemainingTime <= 0)
+        {
+            // Make sure the target alpha is applied
+            mFader->notifyAlphaChanged(mTargetAlpha);
+            finish();
+            return;
+        }
+
         if (mRemainingTime > mTargetTime)
         {
             mRemainingTime -= dt;
@@ -162,7 +170,7 @@ namespace MWGui
         if (time < 0.f)
             return;
 
-        if (time == 0.f)
+        if (time == 0.f && delay == 0.f)
         {
             mCurrentAlpha = targetAlpha;
             applyAlpha();