diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
index 1d4926a..9553562 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/ToolItem.java
@@ -992,9 +992,9 @@
 		} else {
 			imageList.put (imageIndex, image);
 		}
-	}
-	if (!enabled) {
-		setImage(image);
+		if (!enabled) {
+			setImage(image);
+		}
 	}
 }
 
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java
index f8dbccb..2455082 100644
--- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java
+++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_ToolItem.java
@@ -69,23 +69,37 @@
 		toolItem.setImage(images[0]);
 		toolItem.setDisabledImage(images[1]);
 		toolItem.setEnabled(false);
-		assertEquals(images[1], item.getImage());
+		assertEquals(images[1], toolItem.getImage());
+
 		toolItem.setEnabled(true);
-		assertEquals(images[0], item.getImage());
+		assertEquals(images[0], toolItem.getImage());
+
 		toolItem.setDisabledImage(images[0]);
-		assertEquals(images[0], item.getImage());
+		assertEquals(images[0], toolItem.getImage());
+
 		toolItem.setEnabled(false);
-		assertEquals(images[0], item.getImage());
+		assertEquals(images[0], toolItem.getImage());
+
 		toolItem.setImage(images[0]);
 		toolItem.setEnabled(true);
-		assertEquals(images[0], item.getImage());
+		assertEquals(images[0], toolItem.getImage());
+
 		toolItem.setDisabledImage(images[2]);
 		toolItem.setEnabled(false);
-		assertEquals(images[2], item.getImage());
+		assertEquals(images[2], toolItem.getImage());
+
 		toolItem.setEnabled(true);
 		toolItem.setDisabledImage(null);
 		toolItem.setEnabled(false);
-		assertEquals(images[0], item.getImage());
+		assertEquals(images[0], toolItem.getImage());
+
+		toolItem.setEnabled(true);
+		toolItem.setDisabledImage(null);
+		assertEquals(images[0], toolItem.getImage());
+
+		toolItem.setEnabled(false);
+		toolItem.setDisabledImage(null);
+		assertEquals(images[0], toolItem.getImage());
 	}
 }