diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index 147e0774e7a..23948892f09 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -537,6 +537,7 @@ public:
           w(widget) { }
 
     void beginPaint() Q_DECL_OVERRIDE;
+    void endPaint() Q_DECL_OVERRIDE;
 
     QOpenGLWidget *w;
 };
@@ -631,6 +632,16 @@ void QOpenGLWidgetPaintDevicePrivate::beginPaint()
     }
 }
 
+void QOpenGLWidgetPaintDevicePrivate::endPaint()
+{
+    QOpenGLWidgetPrivate *wd = static_cast<QOpenGLWidgetPrivate *>(QWidgetPrivate::get(w));
+    if (!wd->initialized)
+        return;
+
+    if (!wd->inPaintGL)
+        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = 0;
+}
+
 void QOpenGLWidgetPaintDevice::ensureActiveTarget()
 {
     QOpenGLWidgetPaintDevicePrivate *d = static_cast<QOpenGLWidgetPaintDevicePrivate *>(d_ptr.data());
@@ -643,6 +654,9 @@ void QOpenGLWidgetPaintDevice::ensureActiveTarget()
     else
         wd->fbo->bind();
 
+    if (!wd->inPaintGL)
+        QOpenGLContextPrivate::get(wd->context)->defaultFboRedirect = wd->fbo->handle();
+
     // When used as a viewport, drawing is done via opening a QPainter on the widget
     // without going through paintEvent(). We will have to make sure a glFlush() is done
     // before the texture is accessed also in this case.
diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
index e3e26d612f0..f13291d0a91 100644
--- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
+++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp
@@ -282,6 +282,13 @@ protected:
 void CountingGraphicsView::drawForeground(QPainter *, const QRectF &)
 {
     ++m_count;
+
+    // QTBUG-59318: verify that the context's internal default fbo redirection
+    // is active also when using the QOpenGLWidget as a viewport.
+    GLint currentFbo = -1;
+    QOpenGLContext::currentContext()->functions()->glGetIntegerv(GL_FRAMEBUFFER_BINDING, &currentFbo);
+    GLuint defFbo = QOpenGLContext::currentContext()->defaultFramebufferObject();
+    QCOMPARE(GLuint(currentFbo), defFbo);
 }
 
 void tst_QOpenGLWidget::asViewport()