diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
index 79d7ef7a01..45ae72a3ea 100644
--- a/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
+++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
@@ -291,15 +291,20 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsDialog* dialog, QWidget*
 	updateRendererDependentOptions();
 
 	// only allow disabling readbacks for per-game settings, it's too dangerous
+#ifndef PCSX2_DEVBUILD
 	m_ui.disableHardwareReadbacks->setEnabled(m_dialog->isPerGameSettings());
 
-	// allow Texture Offset for per-game settings only 
-	m_ui.textureOffsetX->setEnabled(m_dialog->isPerGameSettings());
-	m_ui.textureOffsetY->setEnabled(m_dialog->isPerGameSettings());
-
-	// allow Skipdraw Range for per-game settings only 
-	m_ui.skipDrawStart->setEnabled(m_dialog->isPerGameSettings());
-	m_ui.skipDrawEnd->setEnabled(m_dialog->isPerGameSettings());
+	// Remove texture offset and skipdraw range for global settings.
+	if (!m_dialog->isPerGameSettings())
+	{
+		m_ui.upscalingFixesLayout->removeRow(2);
+		m_ui.hardwareFixesLayout->removeRow(2);
+		m_ui.skipDrawStart = nullptr;
+		m_ui.skipDrawEnd = nullptr;
+		m_ui.textureOffsetX = nullptr;
+		m_ui.textureOffsetY = nullptr;
+	}
+#endif
 
 	// Display tab
 	{
diff --git a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
index b219e01b69..19a5e89192 100644
--- a/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
+++ b/pcsx2-qt/Settings/GraphicsSettingsWidget.ui
@@ -58,7 +58,7 @@
    <item>
     <widget class="QTabWidget" name="hardwareRendererGroup">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <property name="documentMode">
       <bool>true</bool>
@@ -699,7 +699,7 @@
       <attribute name="title">
        <string>Hardware Fixes</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout_2">
+      <layout class="QFormLayout" name="hardwareFixesLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="label_10">
          <property name="text">
@@ -883,7 +883,7 @@
       <attribute name="title">
        <string>Upscaling Fixes</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout_5">
+      <layout class="QFormLayout" name="upscalingFixesLayout">
        <item row="0" column="0">
         <widget class="QLabel" name="label_14">
          <property name="text">
@@ -942,16 +942,16 @@
         </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QLabel" name="label_16">
+        <widget class="QLabel" name="textureOffsetLabel">
          <property name="text">
           <string>Texture Offsets:</string>
          </property>
         </widget>
        </item>
        <item row="2" column="1">
-        <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,0,1">
+        <layout class="QHBoxLayout" name="textureOffsetLayout" stretch="0,1,0,1">
          <item>
-          <widget class="QLabel" name="label_17">
+          <widget class="QLabel" name="textureOffsetXLabel">
            <property name="text">
             <string>X:</string>
            </property>
@@ -965,7 +965,7 @@
           </widget>
          </item>
          <item>
-          <widget class="QLabel" name="label_18">
+          <widget class="QLabel" name="textureOffsetYLabel">
            <property name="text">
             <string>Y:</string>
            </property>
diff --git a/pcsx2-qt/Settings/SettingsDialog.cpp b/pcsx2-qt/Settings/SettingsDialog.cpp
index 4e60c68a76..5550973154 100644
--- a/pcsx2-qt/Settings/SettingsDialog.cpp
+++ b/pcsx2-qt/Settings/SettingsDialog.cpp
@@ -214,6 +214,9 @@ void SettingsDialog::addWidget(QWidget* widget, QString title, QString icon, QSt
 
 void SettingsDialog::registerWidgetHelp(QObject* object, QString title, QString recommended_value, QString text)
 {
+	if (!object)
+		return;
+
 	// construct rich text with formatted description
 	QString full_text;
 	full_text += "<table width='100%' cellpadding='0' cellspacing='0'><tr><td><strong>";