diff --git a/CUERipper/frmCUERipper.Designer.cs b/CUERipper/frmCUERipper.Designer.cs
index 8648d16..0da2382 100644
--- a/CUERipper/frmCUERipper.Designer.cs
+++ b/CUERipper/frmCUERipper.Designer.cs
@@ -716,6 +716,7 @@ namespace CUERipper
             this.pictureBox1.TabStop = false;
             this.pictureBox1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseClick);
             this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
+            this.pictureBox1.MouseLeave += new System.EventHandler(this.pictureBox1_MouseLeave);
             this.pictureBox1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
             this.pictureBox1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseUp);
             // 
diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs
index d67d3ae..7a506fa 100644
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -477,7 +477,7 @@ namespace CUERipper
 					bnComboBoxOutputFormat.Items.RemoveAt(OutputPathUseTemplates.Length + 10);
 			}
 
-            if (currentAlbumArt < albumArt.Count)
+            if (currentAlbumArt >= 0 && currentAlbumArt < albumArt.Count)
             {
                 data.selectedRelease.metadata.AlbumArt.Clear();
                 data.selectedRelease.metadata.AlbumArt.Add(albumArt[currentAlbumArt].meta);
@@ -602,7 +602,7 @@ namespace CUERipper
 			listTracks.EndUpdate();
 			listMetadata.EndUpdate();
 
-            UpdateAlbumArt(true);
+            SelectAlbumArt();
 			SetupControls();
 		}
 
@@ -1457,18 +1457,13 @@ namespace CUERipper
                     backgroundWorkerArtwork.CancelAsync();
                 albumArt.Clear();
             }
-            UpdateAlbumArt(false);
+            currentAlbumArt = 0;
+            resetPictureBox(null);
         }
 
-        private void UpdateAlbumArt(bool selectRelease)
+        private void SelectAlbumArt()
         {
-            if (albumArt.Count == 0)
-            {
-                resetPictureBox(null);
-                return;
-            }
-
-            if (selectRelease && data.selectedRelease != null && data.selectedRelease.metadata.AlbumArt.Count > 0)
+            if (data.selectedRelease != null && data.selectedRelease.metadata.AlbumArt.Count > 0)
             {
                 for (int i = 0; i < albumArt.Count; i++)
                 {
@@ -1483,8 +1478,6 @@ namespace CUERipper
                 }
             }
 
-            if (currentAlbumArt >= albumArt.Count)
-                currentAlbumArt = 0;
             resetPictureBox(null);
         }
 
@@ -1537,7 +1530,7 @@ namespace CUERipper
 
         private void backgroundWorkerArtwork_ProgressChanged(object sender, ProgressChangedEventArgs e)
         {
-            UpdateAlbumArt(true);
+            SelectAlbumArt();
         }
 
         private void backgroundWorkerArtwork_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
@@ -1546,15 +1539,6 @@ namespace CUERipper
             toolStripProgressBar1.Value = 0;
         }
 
-        private void pictureBox1_MouseClick(object sender, MouseEventArgs e)
-        {
-            if (e.Button == System.Windows.Forms.MouseButtons.Left)
-            {
-                currentAlbumArt++;
-                UpdateAlbumArt(false);
-            }
-        }
-
         private void buttonSettings_Click(object sender, EventArgs e)
         {
             var form = new Options(new CUERipperSettings(this._config));
@@ -1605,7 +1589,13 @@ namespace CUERipper
         private void resetPictureBox(MouseEventArgs e)
         {
             if (currentAlbumArt < 0 || currentAlbumArt >= albumArt.Count)
+            {
+                pictureBox1.Image = null;
+                toolStripStatusLabel1.Text = "";
                 return;
+            }
+
+            toolStripStatusLabel1.Text = albumArt[currentAlbumArt].meta.uri;
 
             if (e == null || e.Button != System.Windows.Forms.MouseButtons.Right || _config.advanced.coversSearch != CUEConfigAdvanced.CTDBCoversSearch.Large)
             {
@@ -1625,15 +1615,37 @@ namespace CUERipper
             pictureBox1.Image = cropImage(albumArt[currentAlbumArt].image, pictureBox1.ClientSize, rf);
         }
 
+        private void pictureBox1_MouseClick(object sender, MouseEventArgs e)
+        {
+            if (e.Button == System.Windows.Forms.MouseButtons.Left)
+            {
+                if (++currentAlbumArt > albumArt.Count)
+                    currentAlbumArt = 0;
+                resetPictureBox(null);
+            }
+        }
+
         private void pictureBox1_MouseDown(object sender, MouseEventArgs e)
         {
             if (e.Button == System.Windows.Forms.MouseButtons.Right)
                 resetPictureBox(e);
+            if (currentAlbumArt < 0 || currentAlbumArt >= albumArt.Count)
+            {
+                toolStripStatusLabel1.Text = "";
+                return;
+            }
+            toolStripStatusLabel1.Text = albumArt[currentAlbumArt].meta.uri;
         }
 
         private void pictureBox1_MouseUp(object sender, MouseEventArgs e)
         {
-            resetPictureBox(null);
+            if (e.Button == System.Windows.Forms.MouseButtons.Right)
+                resetPictureBox(null);
+        }
+
+        private void pictureBox1_MouseLeave(object sender, EventArgs e)
+        {
+            toolStripStatusLabel1.Text = null;
         }
 	}
 
diff --git a/CUERipper/frmCUERipper.resx b/CUERipper/frmCUERipper.resx
index 37a60e1..356af4a 100644
--- a/CUERipper/frmCUERipper.resx
+++ b/CUERipper/frmCUERipper.resx
@@ -816,7 +816,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABy
-        CQAAAk1TRnQBSQFMAgEBBAEAAaQBAgGkAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CQAAAk1TRnQBSQFMAgEBBAEAAawBAgGsAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -966,7 +966,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAY
-        EgAAAk1TRnQBSQFMAgEBCwEAAaQBAgGkAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        EgAAAk1TRnQBSQFMAgEBCwEAAawBAgGsAQIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA