Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java	(revision 31376)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryData.java	(revision 31377)
@@ -228,5 +228,5 @@
       if (image instanceof MapillaryImage) {
         MapillaryImage mapillaryImage = (MapillaryImage) image;
-        // Donwloadins thumbnails of surrounding pictures.
+        // Downloading thumbnails of surrounding pictures.
         if (mapillaryImage.next() != null) {
           new MapillaryCache(((MapillaryImage) mapillaryImage.next()).getKey(), MapillaryCache.Type.THUMBNAIL).submit(
Index: /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java
===================================================================
--- /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 31376)
+++ /applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java	(revision 31377)
@@ -163,6 +163,4 @@
         mapillaryImageDisplay.hyperlink.setVisible(true);
         MapillaryImage mapillaryImage = (MapillaryImage) this.image;
-        updateTitle();
-
         mapillaryImageDisplay.hyperlink.setURL(mapillaryImage.getKey());
         // Downloads the thumbnail.
@@ -182,4 +180,5 @@
       } else if (image instanceof MapillaryImportedImage) {
         mapillaryImageDisplay.hyperlink.setVisible(false);
+        mapillaryImageDisplay.hyperlink.setURL(null);
         MapillaryImportedImage mapillaryImage = (MapillaryImportedImage) this.image;
         try {
@@ -188,6 +187,6 @@
           Main.error(e);
         }
-        mapillaryImageDisplay.hyperlink.setURL(null);
-      }
+      }
+      updateTitle();
     }
   }
@@ -223,11 +222,20 @@
     } else {
       if (this.image != null) {
-        MapillaryImage mapillaryImage = (MapillaryImage) this.image;
-        String title = tr(BASE_TITLE);
-        if (mapillaryImage.getUser() != null)
-          title += " -- " + mapillaryImage.getUser();
-        if (mapillaryImage.getCapturedAt() != 0)
-          title += " -- " + mapillaryImage.getDate();
-        setTitle(title);
+        if (this.image instanceof MapillaryImage) {
+          MapillaryImage mapillaryImage = (MapillaryImage) this.image;
+          String title = tr(BASE_TITLE);
+          if (mapillaryImage.getUser() != null)
+            title += " -- " + mapillaryImage.getUser();
+          if (mapillaryImage.getCapturedAt() != 0)
+            title += " -- " + mapillaryImage.getDate();
+          setTitle(title);
+        }
+        else if (this.image instanceof MapillaryImportedImage) {
+          MapillaryImportedImage mapillaryImportedImage = (MapillaryImportedImage) this.image;
+          String title = tr(BASE_TITLE);
+          title += " -- " + mapillaryImportedImage.getFile().getName();
+          title += " -- " + mapillaryImportedImage.getDate();
+          setTitle(title);
+        }
       }
     }
@@ -257,7 +265,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-      if (MapillaryMainDialog.getInstance().getImage() != null) {
-        MapillaryData.getInstance().selectNext();
-      }
+      MapillaryData.getInstance().selectNext();
     }
   }
@@ -278,7 +284,5 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-      if (MapillaryMainDialog.getInstance().getImage() != null) {
-        MapillaryData.getInstance().selectPrevious();
-      }
+      MapillaryData.getInstance().selectPrevious();
     }
   }
@@ -395,5 +399,5 @@
   public void selectedImageChanged(MapillaryAbstractImage oldImage,
       MapillaryAbstractImage newImage) {
-    setImage(MapillaryData.getInstance().getSelectedImage());
+    setImage(newImage);
     updateImage();
   }