diff --git a/lib/browser/app.js b/lib/browser/app.js
index 4c3d5c9a..c941effd 100644
--- a/lib/browser/app.js
+++ b/lib/browser/app.js
@@ -216,6 +216,7 @@ app.controller('AppController', function(
     // "returns" to the first step.
     self.selection.clear();
 
+    self.openImageSelector();
     AnalyticsService.logEvent('Reselect image');
   };
 
@@ -224,7 +225,7 @@ app.controller('AppController', function(
       return;
     }
 
-    self.selection.removeDrive();
+    self.openDriveSelector();
     AnalyticsService.logEvent('Reselect drive');
   };
 
diff --git a/lib/partials/main.html b/lib/partials/main.html
index a7e62190..5976bf43 100644
--- a/lib/partials/main.html
+++ b/lib/partials/main.html
@@ -10,7 +10,7 @@
           <p class="step-footer">*supported files: .img, .iso, .zip</p>
         </div>
         <div ng-show="app.selection.hasImage()">
-          <div ng-bind="app.selection.getImage() | basename" ng-click="app.reselectImage()"></div>
+          <div ng-bind="app.selection.getImage() | basename"></div>
 
           <button class="btn btn-link step-footer"
             ng-click="app.reselectImage()"
@@ -44,8 +44,7 @@
 
         </div>
         <div ng-show="app.selection.hasDrive()">
-          <div ng-bind="app.selection.getDrive().name + ' - ' + app.selection.getDrive().size"
-            ng-click="app.reselectDrive()"></div>
+          <div ng-bind="app.selection.getDrive().name + ' - ' + app.selection.getDrive().size"></div>
 
           <button class="btn btn-link step-footer"
             ng-click="app.reselectDrive()"