diff --git a/Controls.DocumentViewer/App.config b/Controls.DocumentViewer/App.config
index 181c5758..42fa012b 100644
--- a/Controls.DocumentViewer/App.config
+++ b/Controls.DocumentViewer/App.config
@@ -23,7 +23,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb
index fd710e27..8815a579 100644
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -55,6 +55,7 @@ Public Class DocumentViewer
 
     Private _hide_file_info_from_user As Boolean = False
 
+
     Private _FileStream As Stream
     Private _FilePath As String
     Private _FileInfo As FileInfo
@@ -79,6 +80,7 @@ Public Class DocumentViewer
     End Class
 
     Public Property FileLoaded As Boolean = False
+    Public Property Viewer_ForceTemporaryMode As Boolean = False
     Public ReadOnly Property AnnotationsSaved As Boolean
         Get
             Return Not _AnnotationsPending
@@ -497,7 +499,10 @@ Public Class DocumentViewer
                 Case Else
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    GdViewer.ForceTemporaryMode = True
+                    If Viewer_ForceTemporaryMode = True Then
+                        GdViewer.ForceTemporaryMode = True
+                    End If
+
                     GdViewer.AnnotationDropShadow = True
                     GdViewer.BackColor = Color.White
 
@@ -553,7 +558,9 @@ Public Class DocumentViewer
                 Case Else
                     GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-                    GdViewer.ForceTemporaryMode = True
+                    If Viewer_ForceTemporaryMode = True Then
+                        GdViewer.ForceTemporaryMode = True
+                    End If
                     GdViewer.AnnotationDropShadow = True
 
                     GdViewer.DisplayFromStream(Stream)
diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index 3b46b062..48003a15 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -200,8 +200,8 @@
     <Reference Include="System.CodeDom, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll</HintPath>
     </Reference>
-    <Reference Include="System.Collections.Immutable, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
     </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb
index 4e9d3218..549bd01d 100644
--- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb	
+++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb	
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.1.0.0")>
-<Assembly: AssemblyFileVersion("2.1.0.0")>
+<Assembly: AssemblyVersion("2.2.0.0")>
+<Assembly: AssemblyFileVersion("2.2.0.0")>
diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config
index 9ac55089..4c46deb2 100644
--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@@ -20,7 +20,7 @@
   <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
   <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
   <package id="System.CodeDom" version="8.0.0" targetFramework="net462" />
-  <package id="System.Collections.Immutable" version="8.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
   <package id="System.IO.Packaging" version="8.0.1" targetFramework="net462" />
   <package id="System.Management" version="8.0.0" targetFramework="net462" />
   <package id="System.Memory" version="4.6.0" targetFramework="net462" />
diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb
index 64366cab..5c8d9544 100644
--- a/GUIs.Test.TestGUI/frmDocView.vb
+++ b/GUIs.Test.TestGUI/frmDocView.vb
@@ -12,6 +12,7 @@ Public Class frmDocView
             If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
                 txtfilepath.Text = OpenFileDialog1.FileName
                 MyDocumentViewer.LoadFile(txtfilepath.Text)
+                txtfilepath.Text = ""
             End If
         Else
             MyDocumentViewer.LoadFile(txtfilepath.Text)