diff --git a/src/calibre/gui2/dialogs/comments_dialog.py b/src/calibre/gui2/dialogs/comments_dialog.py
index aa16dff83b..5403095ed1 100644
--- a/src/calibre/gui2/dialogs/comments_dialog.py
+++ b/src/calibre/gui2/dialogs/comments_dialog.py
@@ -5,20 +5,29 @@ __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __license__   = 'GPL v3'
 
-from qt.core import Qt, QDialog, QDialogButtonBox, QVBoxLayout, QPlainTextEdit, QSize, QApplication
+from qt.core import (
+    QApplication, QDialog, QDialogButtonBox, QPlainTextEdit, QSize, Qt, QVBoxLayout
+)
 
-from calibre.gui2 import gprefs, Application
-from calibre.gui2.dialogs.comments_dialog_ui import Ui_CommentsDialog
-from calibre.library.comments import comments_to_html
+from calibre.gui2 import Application, gprefs
+from calibre.gui2.comments_editor import Editor
 from calibre.gui2.widgets2 import Dialog
+from calibre.library.comments import comments_to_html
 
 
-class CommentsDialog(QDialog, Ui_CommentsDialog):
+class CommentsDialog(QDialog):
 
     def __init__(self, parent, text, column_name=None):
         QDialog.__init__(self, parent)
-        Ui_CommentsDialog.__init__(self)
-        self.setupUi(self)
+        self.setObjectName("CommentsDialog")
+        self.setWindowTitle(_("Edit comments"))
+        self.verticalLayout = l = QVBoxLayout(self)
+        self.textbox = tb = Editor(self)
+        self.buttonBox = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel, self)
+        bb.accepted.connect(self.accept)
+        bb.rejected.connect(self.reject)
+        l.addWidget(tb)
+        l.addWidget(bb)
         # Remove help icon on title bar
         icon = self.windowIcon()
         self.setWindowFlags(self.windowFlags()&(~Qt.WindowType.WindowContextHelpButtonHint))
@@ -27,8 +36,6 @@ class CommentsDialog(QDialog, Ui_CommentsDialog):
         self.textbox.html = comments_to_html(text) if text else ''
         self.textbox.wyswyg_dirtied()
         # self.textbox.setTabChangesFocus(True)
-        self.buttonBox.button(QDialogButtonBox.StandardButton.Ok).setText(_('O&K'))
-        self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setText(_('&Cancel'))
 
         if column_name:
             self.setWindowTitle(_('Edit "{0}"').format(column_name))
diff --git a/src/calibre/gui2/dialogs/comments_dialog.ui b/src/calibre/gui2/dialogs/comments_dialog.ui
deleted file mode 100644
index 19d39ca754..0000000000
--- a/src/calibre/gui2/dialogs/comments_dialog.ui
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CommentsDialog</class>
- <widget class="QDialog" name="CommentsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>400</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string>Edit comments</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="Editor" name="textbox" native="true"/>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>Editor</class>
-   <extends>QWidget</extends>
-   <header>calibre/gui2/comments_editor.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>CommentsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>229</x>
-     <y>211</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>234</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>CommentsDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>297</x>
-     <y>217</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>234</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>