diff --git a/CHANGELOG.md b/CHANGELOG.md
index 292c5eb8..792f0321 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta
 
 =================================================
 
+25.06.2020
+
+- made sure that when trying to view the source but no object is selected, the messages are correct
+
 23.06.2020
 
 - working on Tool Drilling
diff --git a/app_Main.py b/app_Main.py
index cebc165c..a42add60 100644
--- a/app_Main.py
+++ b/app_Main.py
@@ -7509,9 +7509,6 @@ class App(QtCore.QObject):
         :return:
         """
 
-        self.inform.emit('%s' % _("Viewing the source code of the selected object."))
-        self.proc_container.view.set_busy(_("Loading..."))
-
         try:
             obj = self.collection.get_active()
         except Exception as e:
@@ -7523,6 +7520,9 @@ class App(QtCore.QObject):
             self.inform.emit('[WARNING_NOTCL] %s' % _("Select an Gerber or Excellon file to view it's source file."))
             return 'fail'
 
+        self.inform.emit('%s' % _("Viewing the source code of the selected object."))
+        self.proc_container.view.set_busy(_("Loading..."))
+
         flt = "All Files (*.*)"
         if obj.kind == 'gerber':
             flt = "Gerber Files .gbr (*.GBR);;PDF Files .pdf (*.PDF);;All Files (*.*)"