diff --git a/GUIs.Common/DocumentResultList/Config.vb b/GUIs.Common/DocumentResultList/Config.vb
index 603bd2e7..9f388044 100644
--- a/GUIs.Common/DocumentResultList/Config.vb
+++ b/GUIs.Common/DocumentResultList/Config.vb
@@ -5,7 +5,6 @@ Namespace DocumentResultList
         Public Property WindowLocation As Point
         Public Property WindowSize As Size
         Public Property GridFontSizeDelta As Integer = 0
-        Public Property SelectedWorkspace As String = Workspace.DEFAULT_WORKSPACE
+        Public Property SelectedWorkspace As String = Workspace(Of Config).DEFAULT_WORKSPACE
     End Class
-
 End Namespace
\ No newline at end of file
diff --git a/GUIs.Common/DocumentResultList/Workspace.vb b/GUIs.Common/DocumentResultList/Workspace.vb
index caab8735..e36d36d9 100644
--- a/GUIs.Common/DocumentResultList/Workspace.vb
+++ b/GUIs.Common/DocumentResultList/Workspace.vb
@@ -8,11 +8,11 @@ Imports DigitalData.Modules.Filesystem
 Imports DigitalData.Modules.Language
 
 Namespace DocumentResultList
-    Public Class Workspace
+    Public Class Workspace(Of TConfig)
         Inherits BaseClass
 
         Private ReadOnly Manager As WorkspaceManager
-        Private ReadOnly Config As ConfigManager(Of Config)
+        Private ReadOnly Config As ConfigManager(Of TConfig)
         Private ReadOnly FileEx As File
 
         Public Const WORKSPACE_FILENAME As String = "Workspaces.xml"
@@ -37,7 +37,7 @@ Namespace DocumentResultList
             End Get
         End Property
 
-        Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pWorkspaceManager As WorkspaceManager)
+        Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of TConfig), pWorkspaceManager As WorkspaceManager)
             MyBase.New(pLogConfig)
             Manager = pWorkspaceManager
             Config = pConfigManager
diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb
index 3a49e4e7..e3f14d03 100644
--- a/GUIs.Common/frmDocumentResultList.vb
+++ b/GUIs.Common/frmDocumentResultList.vb
@@ -48,7 +48,7 @@ Public Class frmDocumentResultList
     Private ReadOnly Params As Params
     Private ReadOnly LayoutManager As Layout
     Private ReadOnly FormHelper As FormHelper
-    Private ReadOnly Workspace As Workspace
+    Private ReadOnly Workspace As Workspace(Of Config)
     Private WithEvents Watcher As Watcher
 
     ' Runtime variables
@@ -119,7 +119,7 @@ Public Class frmDocumentResultList
         GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
         FileEx = New Modules.Windows.File(pLogConfig)
         LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3})
-        Workspace = New Workspace(pLogConfig, Config, WorkspaceManager1)
+        Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1)
 
         UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
     End Sub