diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
index 8363211e1..da6d6c9b8 100644
--- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
@@ -76,8 +76,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	private final static int CANCEL_HEIGHT = 20;
 	private final static int CANCEL_WIDTH = 50;
 
-	private final static int ETA_TOP_OFFSET = 165;
-	private final static int ETA_LEFT_OFFSET = 8;
+	private final static int TITLE_TOP_OFFSET = 7;
+	private final static int TITLE_LEFT_OFFSET = 8;
 
 	private final static int ITEMSTACK_LEFT_OFFSET = 9;
 	private final static int ITEMSTACK_TOP_OFFSET = 22;
@@ -192,18 +192,18 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
 	@Override
 	public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
 	{
-		ReadableNumberConverter converter = ReadableNumberConverter.INSTANCE;
+		final ReadableNumberConverter converter = ReadableNumberConverter.INSTANCE;
+		String title = this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() );
 
-		this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.CraftingStatus.getLocal() ), 8, 7, TEXT_COLOR );
-
-		if( this.craftingCpu.eta > 0 )
+		if( this.craftingCpu.eta > 0 && !this.visual.isEmpty() )
 		{
-			final String etaText = this.getGuiDisplayName( GuiText.ETA.getLocal() );
 			final long etaInMilliseconds = TimeUnit.MILLISECONDS.convert( this.craftingCpu.eta, TimeUnit.NANOSECONDS );
-			final String etaTimeText = DurationFormatUtils.formatDuration( etaInMilliseconds, this.getGuiDisplayName( GuiText.ETAFormat.getLocal() ) );
-			this.fontRendererObj.drawString( String.format( etaText, etaTimeText ), ETA_LEFT_OFFSET, ETA_TOP_OFFSET, TEXT_COLOR );
+			final String etaTimeText = DurationFormatUtils.formatDuration( etaInMilliseconds, GuiText.ETAFormat.getLocal() );
+			title += " - " + etaTimeText;
 		}
 
+		this.fontRendererObj.drawString( title, TITLE_LEFT_OFFSET, TITLE_TOP_OFFSET, TEXT_COLOR );
+
 		int x = 0;
 		int y = 0;
 		final int viewStart = this.myScrollBar.getCurrentScroll() * 3;
diff --git a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java
index c90bed5fa..bd7ac1836 100644
--- a/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java
+++ b/src/main/java/appeng/container/implementations/ContainerCraftingCPU.java
@@ -139,6 +139,7 @@ public class ContainerCraftingCPU extends AEBaseContainer implements IMEMonitorH
 		{
 			this.monitor = null;
 			this.cpuName = "";
+			this.eta = -1;
 		}
 	}
 
diff --git a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang
index 7c7806f23..007c050f6 100644
--- a/src/main/resources/assets/appliedenergistics2/lang/en_US.lang
+++ b/src/main/resources/assets/appliedenergistics2/lang/en_US.lang
@@ -194,7 +194,6 @@ gui.appliedenergistics2.Lumen=Lumen
 gui.appliedenergistics2.Empty=Empty
 gui.appliedenergistics2.Stored=Stored
 gui.appliedenergistics2.Cancel=Cancel
-gui.appliedenergistics2.ETA=ETA: %s
 gui.appliedenergistics2.ETAFormat=HH:mm:ss
 gui.appliedenergistics2.Crafting=Crafting
 gui.appliedenergistics2.Scheduled=Scheduled