diff --git a/rpcs3/rpcs3qt/game_compatibility.h b/rpcs3/rpcs3qt/game_compatibility.h
index 4c9ea4e3ea..f24ebfbe1f 100644
--- a/rpcs3/rpcs3qt/game_compatibility.h
+++ b/rpcs3/rpcs3qt/game_compatibility.h
@@ -2,7 +2,6 @@
 
 #include <memory>
 
-#include <QPainter>
 #include <QJsonObject>
 
 class downloader;
diff --git a/rpcs3/rpcs3qt/game_list_base.cpp b/rpcs3/rpcs3qt/game_list_base.cpp
index 26d0dbd7c1..df6ce992fe 100644
--- a/rpcs3/rpcs3qt/game_list_base.cpp
+++ b/rpcs3/rpcs3qt/game_list_base.cpp
@@ -3,6 +3,7 @@
 #include "localized.h"
 
 #include <QDir>
+#include <QPainter>
 
 #include <cmath>
 #include <unordered_set>
diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index abbc49792e..7f176813d8 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -1018,6 +1018,7 @@ void gs_frame::take_screenshot(std::vector<u8> data, u32 sshot_width, u32 sshot_
 						QImage screenshot_img(rows[0], img.width(), img.height(), QImage::Format_RGBA8888);
 						QPainter painter(&screenshot_img);
 						painter.drawImage(manager.overlay_offset_x, manager.overlay_offset_y, overlay_img);
+						painter.end();
 
 						std::memcpy(rows[0], screenshot_img.constBits(), screenshot_img.sizeInBytes());
 
diff --git a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
index 535965c7bc..8b64f6c6f1 100644
--- a/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_led_settings_dialog.cpp
@@ -111,6 +111,7 @@ void pad_led_settings_dialog::redraw_color_sample() const
 	painter.setPen(QPen(Qt::black, 1));
 	painter.fillPath(path, led_color);
 	painter.drawPath(path);
+	painter.end();
 
 	// Update the color sample widget
 	ui->w_color_sample->setPixmap(color_sample.scaled(w * dpr, h * dpr, Qt::KeepAspectRatio, Qt::TransformationMode::SmoothTransformation));
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.cpp b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
index 76be3f9270..d809a1090a 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.cpp
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.cpp
@@ -863,6 +863,8 @@ void pad_settings_dialog::RepaintPreviewLabel(QLabel* l, int deadzone, int anti_
 		painter.drawEllipse(QRectF(ingame_x - 0.5, ingame_y - 0.5, 1.0, 1.0));
 	}
 
+	painter.end();
+
 	l->setPixmap(pixmap);
 }
 
diff --git a/rpcs3/rpcs3qt/qt_utils.h b/rpcs3/rpcs3qt/qt_utils.h
index aeb2d9022c..ea8db3245d 100644
--- a/rpcs3/rpcs3qt/qt_utils.h
+++ b/rpcs3/rpcs3qt/qt_utils.h
@@ -37,6 +37,7 @@ namespace gui
 				painter.setPen(Qt::NoPen);
 				painter.setBrush(color);
 				painter.drawEllipse(0, 0, width(), height());
+				painter.end();
 			}
 		};
 
diff --git a/rpcs3/rpcs3qt/richtext_item_delegate.h b/rpcs3/rpcs3qt/richtext_item_delegate.h
index f70e231b18..8e09413397 100644
--- a/rpcs3/rpcs3qt/richtext_item_delegate.h
+++ b/rpcs3/rpcs3qt/richtext_item_delegate.h
@@ -4,6 +4,7 @@
 #include <QApplication>
 #include <QStyledItemDelegate>
 #include <QTextDocument>
+#include <QPainter>
 
 class richtext_item_delegate : public QStyledItemDelegate
 {