diff --git a/frontend/static/js/entries.js b/frontend/static/js/entries.js
index e80cf27..11aaa6c 100644
--- a/frontend/static/js/entries.js
+++ b/frontend/static/js/entries.js
@@ -307,11 +307,23 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
       });
     };
 
+    $scope.removeEntry = function(entry) {
+        $scope.removingEntry = entry;
+        $("#remove_entry").modal({
+            keyboard: false,
+        });
+    };
+
+    $scope.hideRemoveEntryPopup = function() {
+        $scope.removingEntry = null;
+        $("#remove_entry").modal("hide");
+    };
+
     // Removes an entry.
-    $scope.removeEntry = function(entry, modalScope) {
+    $scope.confirmRemoveEntry = function() {
       // Cancel current editing.
-      if (!$scope.isNew(entry)) {
-        $http.delete("/api/entries/" + entry.id).success(function (result) {
+      if ($scope.removingEntry) {
+        $http.delete("/api/entries/" + $scope.removingEntry.id).success(function (result) {
           $.pnotify({
               type: "success",
               title: "Delete",
@@ -319,9 +331,9 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
           });
 
           // Send the "entry removed" event.
-          $scope.$emit("entryRemovedEvent", entry);
+          $scope.$emit("entryRemovedEvent", $scope.removingEntry);
 
-          $scope.closeModal(modalScope);
+          $scope.hideRemoveEntryPopup();
         }).error(function (data) {
           $.pnotify({
               type: "error",
@@ -329,7 +341,7 @@ var EntryController = function($scope, $http, $rootScope, $filter) {
               text: data
           });
 
-          $scope.closeModal(modalScope);
+          $scope.hideRemoveEntryPopup();
         });
       }
     };
diff --git a/frontend/templates/index.html b/frontend/templates/index.html
index a049fb7..36747ab 100644
--- a/frontend/templates/index.html
+++ b/frontend/templates/index.html
@@ -114,7 +114,7 @@
               <span class="fa fa-pencil-square-o"></span>
             </button>
 
-            <button class="btn btn-xs btn-default" data-toggle="modal" data-target="#remove_entry" title="remove">
+            <button class="btn btn-xs btn-default" ng-click="removeEntry(entry)" title="remove">
               <span class="fa fa-trash-o"></span>
             </button>
 
diff --git a/frontend/templates/remove_entry.html b/frontend/templates/remove_entry.html
index 5c96350..bf87d7c 100644
--- a/frontend/templates/remove_entry.html
+++ b/frontend/templates/remove_entry.html
@@ -19,19 +19,19 @@
     <div class="modal-content">
       <!-- Dialog header with title -->
       <div class="modal-header">
-        <button class="close" ng-click="dismiss()" aria-hidden="true">&times;</button>
-        <h4 class="modal-title" id="remove_entry_header">Supprimer l'entr&eacute;e [[entry.label]]</h4>
+        <button class="close" ng-click="hideRemoveEntryPopup()" aria-hidden="true">&times;</button>
+        <h4 class="modal-title" id="remove_entry_header">Supprimer l'entr&eacute;e #[[removingEntry.id]]</h4>
       </div>
 
       <!-- Dialog body -->
       <div class="modal-body">
-        <p>Confirmez-vous la suppression de cette entr&eacute;e ?</p>
+        <p>Confirmez-vous la suppression de l'entr&eacute;e « [[ removingEntry.label ]] » ?</p>
       </div>
 
       <!-- Dialog footer with buttons -->
       <div class="modal-footer">
-        <button href="#" class="btn btn-primary" ng-click="dismiss()">Non</button>
-        <button href="#" class="btn btn-default" ng-click="removeEntry(entry, this)">Oui</button>
+        <button href="#" class="btn btn-primary" ng-click="hideRemoveEntryPopup()">Non</button>
+        <button href="#" class="btn btn-default" ng-click="confirmRemoveEntry()">Oui</button>
       </div>
     </div>
   </div>