diff --git a/app/camera/buffer.py b/app/camera/buffer.py
index 123e591..3944643 100644
--- a/app/camera/buffer.py
+++ b/app/camera/buffer.py
@@ -50,6 +50,10 @@ class AppBuffer(Buffer):
         else:
             self.buffer_widget.take_photo("~/Downloads")
 
+    def destroy_buffer(self):
+        self.buffer_widget.stop_camera()
+        super().destroy_buffer()
+
 class CameraWidget(QWidget):
 
     def __init__(self, background_color):
@@ -92,6 +96,9 @@ class CameraWidget(QWidget):
         image_capture.capture(photo_path)
         self.message_to_emacs.emit("Captured Photo at " + photo_path)
 
+    def stop_camera(self):
+        self.camera.stop()
+
 if __name__ == "__main__":
     from PyQt5.QtWidgets import QApplication
     import sys