diff --git a/instat/dlgImportDataset.vb b/instat/dlgImportDataset.vb
index 7aef17acda3..8851b8888e9 100644
--- a/instat/dlgImportDataset.vb
+++ b/instat/dlgImportDataset.vb
@@ -616,9 +616,7 @@ Public Class dlgImportDataset
                 'get the name of the file (without extension), with any special characters removed
                 strFileName = GetCleanFileName(strFilePath)
                 strCurrentDirectory = Path.GetDirectoryName(strFilePath)
-                If Not bFromLibrary Then
-                    strFileExtension = Path.GetExtension(strFilePath).ToLower()
-                End If
+                strFileExtension = Path.GetExtension(strFilePath).ToLower()
             ElseIf Directory.Exists(strFilePath) AndAlso strNewFileExt <> "" Then
                 strCurrentDirectory = strFilePath
                 strFileExtension = strNewFileExt
@@ -660,7 +658,7 @@ Public Class dlgImportDataset
             End If
             ucrBase.clsRsyntax.SetBaseRFunction(clsImportMultipleFiles)
         Else
-            'enable multiple files import for the following files only
+            'don't enable multiple files import for the following files only; .rds, .xlsx, .xls
             ucrChkMultipleFiles.SetVisible(Not (strFileExtension = ".rds" OrElse strFileExtension = ".xlsx" OrElse strFileExtension = ".xls"))
 
             'TODO This needs to be different when RDS is a data frame
diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
index 44e4ad98169..2b34a7ae071 100644
--- a/instat/frmMain.Designer.vb
+++ b/instat/frmMain.Designer.vb
@@ -207,6 +207,7 @@ Partial Class frmMain
         Me.mnuClimaticTidyandExamineMerge = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuClimaticTidyandExamineAppend = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator69 = New System.Windows.Forms.ToolStripSeparator()
+        Me.mnuSetupForDataEntry = New System.Windows.Forms.ToolStripMenuItem()
         Me.mnuTidyandExamineClimaticDataEntry = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator50 = New System.Windows.Forms.ToolStripSeparator()
         Me.mnuClimaticTidyandExamineOneVariableSummarize = New System.Windows.Forms.ToolStripMenuItem()
@@ -1545,7 +1546,7 @@ Partial Class frmMain
         '
         'mnuClimaticTidyandExamine
         '
-        Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicates, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuTidyandExamineClimaticDataEntry, Me.ToolStripSeparator50, Me.mnuClimaticTidyandExamineOneVariableSummarize, Me.mnuClimaticTidyandExamineOneVariableGraph, Me.mnuClimaticTidyandExamineOneVariableFrequencies})
+        Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineVisualiseData, Me.mnuClimaticTidyandExamineTidyDailyData, Me.mnuClimaticTidyandExamineNonNumericCases, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicates, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuSetupForDataEntry, Me.mnuTidyandExamineClimaticDataEntry, Me.ToolStripSeparator50, Me.mnuClimaticTidyandExamineOneVariableSummarize, Me.mnuClimaticTidyandExamineOneVariableGraph, Me.mnuClimaticTidyandExamineOneVariableFrequencies})
         Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine"
         resources.ApplyResources(Me.mnuClimaticTidyandExamine, "mnuClimaticTidyandExamine")
         '
@@ -1604,6 +1605,11 @@ Partial Class frmMain
         Me.ToolStripSeparator69.Name = "ToolStripSeparator69"
         resources.ApplyResources(Me.ToolStripSeparator69, "ToolStripSeparator69")
         '
+        'mnuSetupForDataEntry
+        '
+        Me.mnuSetupForDataEntry.Name = "mnuSetupForDataEntry"
+        resources.ApplyResources(Me.mnuSetupForDataEntry, "mnuSetupForDataEntry")
+        '
         'mnuTidyandExamineClimaticDataEntry
         '
         Me.mnuTidyandExamineClimaticDataEntry.Name = "mnuTidyandExamineClimaticDataEntry"
@@ -4824,4 +4830,5 @@ Partial Class frmMain
     Friend WithEvents ToolStripSeparator70 As ToolStripSeparator
     Friend WithEvents mnuClimaticCheckDataCheckStationLocations As ToolStripMenuItem
     Friend WithEvents mnuClimaticFileImportfromClimateDataStore As ToolStripMenuItem
+    Friend WithEvents mnuSetupForDataEntry As ToolStripMenuItem
 End Class
diff --git a/instat/frmMain.resx b/instat/frmMain.resx
index 52cf944df81..8f3df258a4e 100644
--- a/instat/frmMain.resx
+++ b/instat/frmMain.resx
@@ -1151,6 +1151,15 @@
   <data name="ToolStripSeparator69.Size" type="System.Drawing.Size, System.Drawing">
     <value>212, 6</value>
   </data>
+  <data name="mnuSetupForDataEntry.Size" type="System.Drawing.Size, System.Drawing">
+    <value>215, 22</value>
+  </data>
+  <data name="mnuSetupForDataEntry.Text" xml:space="preserve">
+    <value>Setup for Data Entry...</value>
+  </data>
+  <data name="mnuSetupForDataEntry.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="mnuTidyandExamineClimaticDataEntry.Size" type="System.Drawing.Size, System.Drawing">
     <value>215, 22</value>
   </data>
@@ -7446,6 +7455,12 @@
   <data name="&gt;&gt;ToolStripSeparator69.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;mnuSetupForDataEntry.Name" xml:space="preserve">
+    <value>mnuSetupForDataEntry</value>
+  </data>
+  <data name="&gt;&gt;mnuSetupForDataEntry.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;mnuTidyandExamineClimaticDataEntry.Name" xml:space="preserve">
     <value>mnuTidyandExamineClimaticDataEntry</value>
   </data>
diff --git a/instat/frmMain.vb b/instat/frmMain.vb
index 6fd1c537d1f..7e4e8940136 100644
--- a/instat/frmMain.vb
+++ b/instat/frmMain.vb
@@ -2360,4 +2360,8 @@ Public Class frmMain
     Private Sub mnuClimaticFileImportfromClimateDataStore_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportfromClimateDataStore.Click
         dlgImportERA5Data.ShowDialog()
     End Sub
+
+    Private Sub mnuSetupForDataEntry_Click(sender As Object, e As EventArgs) Handles mnuSetupForDataEntry.Click
+        dlgSetupForDataEntry.ShowDialog()
+    End Sub
 End Class