diff --git a/src/controller/buffersController.py b/src/controller/buffersController.py
index fe8d8de8..1369aa8d 100644
--- a/src/controller/buffersController.py
+++ b/src/controller/buffersController.py
@@ -220,8 +220,12 @@ class baseBufferController(bufferController):
    if dlg == widgetUtils.YES:
     if self.name[:9] in self.session.settings["other_buffers"]["timelines"]:
      self.session.settings["other_buffers"]["timelines"].remove(self.name[:9])
+     return True
+   elif dlg == widgetUtils.NO:
+    return False
   else:
    output.speak(_(u"This buffer is not a timeline; it can't be deleted."))
+   return False
 
  def put_items_on_list(self, number_of_items):
   log.debug("The list contains %d items " % (self.buffer.list.get_count(),))
diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 5f776964..00a8f202 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -575,7 +575,8 @@ class Controller(object):
   buffer = self.get_current_buffer()
   if not hasattr(buffer, "account"): return
   buff = self.view.search(buffer.name, buffer.account)
-  buffer.remove_buffer()
+  answer = buffer.remove_buffer()
+  if answer == False: return
   self.view.delete_buffer(buff)
   buffer.session.sound.play("delete_timeline.ogg")
   self.buffers.remove(buffer)