diff --git a/src/modules/registrypreview/RegistryPreviewUI/MainWindow.Utilities.cs b/src/modules/registrypreview/RegistryPreviewUI/MainWindow.Utilities.cs
index 82228f2834..8206826473 100644
--- a/src/modules/registrypreview/RegistryPreviewUI/MainWindow.Utilities.cs
+++ b/src/modules/registrypreview/RegistryPreviewUI/MainWindow.Utilities.cs
@@ -430,6 +430,21 @@ namespace RegistryPreview
 
                             registryValue.Value = value;
 
+                            break;
+                        case "REG_DWORD":
+                            if (value.Length <= 0)
+                            {
+                                registryValue.Type = "ERROR";
+                            }
+
+                            break;
+                        case "REG_QWORD":
+                            if (value.Length <= 0)
+                            {
+                                value = resourceLoader.GetString("InvalidQword");
+                            }
+
+                            registryValue.Value = value;
                             break;
                         default:
                             registryValue.Value = value;
diff --git a/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw b/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw
index 9270f17093..03fc8da221 100644
--- a/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw
+++ b/src/modules/registrypreview/RegistryPreviewUI/Strings/en-US/Resources.resw
@@ -138,6 +138,9 @@
   <data name="FilterRegistryName" xml:space="preserve">
     <value>Registry files (*.reg)</value>
   </data>
+  <data name="InvalidQword" xml:space="preserve">
+    <value>(Invalid QWORD (64-bit) value)</value>
+  </data>
   <data name="InvalidRegistryFile" xml:space="preserve">
     <value> doesn't appear to be a valid registry file!</value>
   </data>