diff --git a/MainWindow.cpp b/MainWindow.cpp
index 341034b..fa6f1f9 100644
--- a/MainWindow.cpp
+++ b/MainWindow.cpp
@@ -85,18 +85,22 @@ void MainWindow::handlePaintItemSelectionChanged()
   QListWidgetItem* item = paintList->currentItem();
   currentSelectedItem = item;
 
-  if (item)
+  // Is a paint item selected?
+  bool paintItemSelected = (item ? true : false);
+
+  if (paintItemSelected)
   {
+    // Set current paint.
     uid idx = getItemId(*item);
     setCurrentPaint(idx);
     removeCurrentMapping();
-
-    // Enable creation of mappings when a paint is selected.
-    addMeshAction->setEnabled(true);
-    addTriangleAction->setEnabled(true);
-    addEllipseAction->setEnabled(true);
   }
 
+  // Enable/disable creation of mappings depending on whether a paint is selected.
+  addMeshAction->setEnabled(paintItemSelected);
+  addTriangleAction->setEnabled(paintItemSelected);
+  addEllipseAction->setEnabled(paintItemSelected);
+
   // Update canvases.
   updateCanvases();
 }