diff --git a/openpype/tools/workfiles/app.py b/openpype/tools/workfiles/app.py
index 4b5bf07b47..27ffb768a3 100644
--- a/openpype/tools/workfiles/app.py
+++ b/openpype/tools/workfiles/app.py
@@ -544,10 +544,6 @@ class FilesWidget(QtWidgets.QWidget):
         # file on a refresh of the files model.
         self.auto_select_latest_modified = True
 
-        # Avoid crash in Blender and store the message box
-        # (setting parent doesn't work as it hides the message box)
-        self._messagebox = None
-
         files_view = FilesView(self)
 
         # Create the Files model
@@ -726,9 +722,9 @@ class FilesWidget(QtWidgets.QWidget):
         self.file_opened.emit()
 
     def save_changes_prompt(self):
-        self._messagebox = messagebox = QtWidgets.QMessageBox()
-
-        messagebox.setWindowFlags(QtCore.Qt.FramelessWindowHint)
+        messagebox = QtWidgets.QMessageBox(parent=self)
+        messagebox.setWindowFlags(messagebox.windowFlags() |
+                                  QtCore.Qt.FramelessWindowHint)
         messagebox.setIcon(messagebox.Warning)
         messagebox.setWindowTitle("Unsaved Changes!")
         messagebox.setText(
@@ -739,10 +735,6 @@ class FilesWidget(QtWidgets.QWidget):
             messagebox.Yes | messagebox.No | messagebox.Cancel
         )
 
-        # Parenting the QMessageBox to the Widget seems to crash
-        # so we skip parenting and explicitly apply the stylesheet.
-        messagebox.setStyle(self.style())
-
         result = messagebox.exec_()
         if result == messagebox.Yes:
             return True