diff --git a/docs/source/release/v3.14.0/indirect_inelastic.rst b/docs/source/release/v3.14.0/indirect_inelastic.rst
index 017933a9db77436efd73d14cf1a12c6ff57db22d..206280431e3eb597559939edc5c89a4cb2878133 100644
--- a/docs/source/release/v3.14.0/indirect_inelastic.rst
+++ b/docs/source/release/v3.14.0/indirect_inelastic.rst
@@ -58,6 +58,8 @@ Bugfixes
 - A bug where fixed parameters don't remain fixed when using the FABADA minimizer in ConvFit has been corrected.
 - The expression for the Fit type Yi in MSDFit was incorrect and has now been corrected.
 - The x-axis labels in the output plots for MSDFit are now correct.
+- An unexpected error is now prevented when clicking Plot Guess from the Display combo box in ConvFit without first loading 
+  a reduced file.
 
 
 Data Corrections Interface
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp
index a34aa4b4fca30a628390910582e78c5538bfe001..bf222577c05c6b48ef870a7dd4c9ce44423bc4d5 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp
+++ b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.cpp
@@ -115,6 +115,11 @@ void IndirectFitAnalysisTab::setup() {
   connect(m_fitPropertyBrowser, SIGNAL(functionChanged()), this,
           SLOT(updateParameterValues()));
 
+  connect(m_fitPropertyBrowser, SIGNAL(functionChanged()), this,
+          SLOT(updatePlotGuess()));
+  connect(m_fitPropertyBrowser, SIGNAL(workspaceNameChanged(const QString &)),
+          this, SLOT(updatePlotGuess()));
+
   connect(m_plotPresenter.get(),
           SIGNAL(fitSingleSpectrum(std::size_t, std::size_t)), this,
           SLOT(singleFit(std::size_t, std::size_t)));
@@ -838,12 +843,21 @@ void IndirectFitAnalysisTab::updateFitBrowserParameterValues() {
   m_fitPropertyBrowser->updateParameters();
 }
 
-/*
+/**
+ * Enables Plot Guess in the FitPropertyBrowser if a sample workspace is loaded
+ */
+void IndirectFitAnalysisTab::updatePlotGuess() {
+  auto const sampleWorkspace =
+      m_fittingModel->getWorkspace(getSelectedDataIndex());
+  m_fitPropertyBrowser->updatePlotGuess(sampleWorkspace);
+}
+
+/**
  * Saves the result workspace in the default save directory.
  */
 void IndirectFitAnalysisTab::saveResult() { m_fittingModel->saveResult(); }
 
-/*
+/**
  * Plots the result workspace with the specified name, using the specified
  * plot type. Plot type can either be 'None', 'All' or the name of a
  * parameter. In the case of 'None', nothing will be plotted. In the case of
diff --git a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h
index 6f8ca7338e7759a6d6635db8f276ab2396bda7a0..93ae39539d7ce5166419476e6d8cfe61019dc833 100644
--- a/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h
+++ b/qt/scientific_interfaces/Indirect/IndirectFitAnalysisTab.h
@@ -215,6 +215,7 @@ protected slots:
   void saveResult();
 
 private slots:
+  void updatePlotGuess();
   void emitUpdateFitTypes();
 
 private:
diff --git a/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h b/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h
index 6b592ad34d1a6c3f30ace6aea872bb66dee107ca..44f66409e5f92b91698e7c8a5f35bde8686b16eb 100644
--- a/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h
+++ b/qt/widgets/common/inc/MantidQtWidgets/Common/IndirectFitPropertyBrowser.h
@@ -133,6 +133,8 @@ public:
 
   void setWorkspaceIndex(int i) override;
 
+  void updatePlotGuess(Mantid::API::MatrixWorkspace_const_sptr sampleWorkspace);
+
 public slots:
   void fit() override;
   void sequentialFit() override;
@@ -152,8 +154,6 @@ protected slots:
 
   void clearAllCustomFunctions();
 
-  void updatePlotGuess();
-
   void browserVisibilityChanged(bool isVisible);
 
 signals:
diff --git a/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp b/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp
index 582abb6ce538dc15dfb0158b7d98ed0c570afb19..a816cfdae12e0cd0995828c919ba796e7533de02 100644
--- a/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp
+++ b/qt/widgets/common/src/IndirectFitPropertyBrowser.cpp
@@ -174,9 +174,6 @@ void IndirectFitPropertyBrowser::init() {
   m_functionsGroup = m_browser->addProperty(functionsGroup);
   m_settingsGroup = m_browser->addProperty(settingsGroup);
 
-  connect(this, SIGNAL(functionChanged()), this, SLOT(updatePlotGuess()));
-  connect(this, SIGNAL(workspaceNameChanged(const QString &)), this,
-          SLOT(updatePlotGuess()));
   connect(this, SIGNAL(visibilityChanged(bool)), this,
           SLOT(browserVisibilityChanged(bool)));
   connect(this, SIGNAL(customSettingChanged(QtProperty *)), this,
@@ -818,10 +815,11 @@ void IndirectFitPropertyBrowser::clearAllCustomFunctions() {
 
 /**
  * Updates the plot guess feature in this indirect fit property browser.
+ * @param sampleWorkspace :: The workspace loaded as sample
  */
-void IndirectFitPropertyBrowser::updatePlotGuess() {
-
-  if (getWorkspace() && compositeFunction()->nFunctions() > 0)
+void IndirectFitPropertyBrowser::updatePlotGuess(
+    MatrixWorkspace_const_sptr sampleWorkspace) {
+  if (sampleWorkspace && compositeFunction()->nFunctions() > 0)
     setPeakToolOn(true);
   else
     setPeakToolOn(false);