diff --git a/src/Mod/Fem/femexamples/examplesgui.py b/src/Mod/Fem/femexamples/examplesgui.py
index a1c208989a..676c8daece 100644
--- a/src/Mod/Fem/femexamples/examplesgui.py
+++ b/src/Mod/Fem/femexamples/examplesgui.py
@@ -135,15 +135,20 @@ class FemExamples(QtGui.QWidget):
         self.view.addTopLevelItem(all_materials)
 
         self.view.setHeaderHidden(True)
+        self.view.itemClicked.connect(self.enable_buttons)
 
         # Ok buttons:
         self.button_box = QtGui.QDialogButtonBox(self)
         self.button_box.setOrientation(QtCore.Qt.Horizontal)
         self.button_box.setStandardButtons(
-            QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok
+            QtGui.QDialogButtonBox.Cancel
         )
-        run_button = QtGui.QPushButton(QtGui.QIcon.fromTheme("system-run"), "Run")
-        self.button_box.addButton(run_button, QtGui.QDialogButtonBox.ApplyRole)
+        self.setup_button = QtGui.QPushButton(QtGui.QIcon.fromTheme("document-new"), "Setup")
+        self.setup_button.setEnabled(False)
+        self.button_box.addButton(self.setup_button, QtGui.QDialogButtonBox.AcceptRole)
+        self.run_button = QtGui.QPushButton(QtGui.QIcon.fromTheme("system-run"), "Run")
+        self.run_button.setEnabled(False)
+        self.button_box.addButton(self.run_button, QtGui.QDialogButtonBox.ApplyRole)
         self.button_box.clicked.connect(self.clicked)
 
         # Layout:
@@ -179,6 +184,10 @@ class FemExamples(QtGui.QWidget):
         FreeCADGui.doCommand("from femexamples.manager import run_example")
         FreeCADGui.doCommand("run_example(\"" + str(example) + "\")")
 
+    def enable_buttons(self):
+        self.run_button.setEnabled(True)
+        self.setup_button.setEnabled(True)
+
 
 def show_examplegui():
     mw = FreeCADGui.getMainWindow()