diff --git a/project/sourcescommon.cpp b/project/sourcescommon.cpp
index 339a7a386..84153b1e2 100644
--- a/project/sourcescommon.cpp
+++ b/project/sourcescommon.cpp
@@ -214,6 +214,15 @@ void SourcesCommon::show_context_menu(QWidget* parent, const QModelIndexList& it
 		QObject::connect(delete_action, SIGNAL(triggered(bool)), project_parent, SLOT(delete_selected_media()));
 
 		if (items.size() == 1) {
+      Media* media_item = project_parent->item_to_media(items.at(0));
+
+      if (media_item->get_type() != MEDIA_TYPE_FOLDER) {
+        QAction* preview_in_media_viewer_action = menu.addAction(tr("Preview in Media Viewer"),
+                                                                 this,
+                                                                 SLOT(OpenSelectedMediaInMediaViewerFromAction()));
+        preview_in_media_viewer_action->setData(reinterpret_cast<quintptr>(media_item));
+      }
+
 			QAction* properties_action = menu.addAction(tr("Properties..."));
 			QObject::connect(properties_action, SIGNAL(triggered(bool)), project_parent, SLOT(open_properties()));
 		}
@@ -235,21 +244,17 @@ void SourcesCommon::item_click(Media *m, const QModelIndex& index) {
 	}
 }
 
-void SourcesCommon::mouseDoubleClickEvent(QMouseEvent *, const QModelIndexList& selected_items) {
+void SourcesCommon::mouseDoubleClickEvent(const QModelIndexList& selected_items) {
 	stop_rename_timer();
 	if (selected_items.size() == 0) {
 		project_parent->import_dialog();
 	} else if (selected_items.size() == 1) {
-		Media* item = project_parent->item_to_media(selected_items.at(0));
-		switch (item->get_type()) {
-		case MEDIA_TYPE_FOOTAGE:
-			panel_footage_viewer->set_media(item);
-			panel_footage_viewer->setFocus();
-			break;
-		case MEDIA_TYPE_SEQUENCE:
-			olive::UndoStack.push(new ChangeSequenceAction(item->to_sequence()));
-			break;
-		}
+    Media* media = media;
+    if (media->get_type() == MEDIA_TYPE_SEQUENCE) {
+      olive::UndoStack.push(new ChangeSequenceAction(media->to_sequence()));
+    } else {
+      OpenSelectedMediaInMediaViewer(project_parent->item_to_media(selected_items.at(0)));
+    }
 	}
 }
 
@@ -372,7 +377,19 @@ void SourcesCommon::item_renamed(Media* item) {
 		MediaRename* mr = new MediaRename(item, "idk");
 		olive::UndoStack.push(mr);
 		editing_item = nullptr;
-	}
+  }
+}
+
+void SourcesCommon::OpenSelectedMediaInMediaViewerFromAction()
+{
+  OpenSelectedMediaInMediaViewer(reinterpret_cast<Media*>(static_cast<QAction*>(sender())->data().value<quintptr>()));
+}
+
+void SourcesCommon::OpenSelectedMediaInMediaViewer(Media* item) {
+  if (item->get_type() != MEDIA_TYPE_FOLDER) {
+    panel_footage_viewer->set_media(item);
+    panel_footage_viewer->setFocus();
+  }
 }
 
 void SourcesCommon::open_create_proxy_dialog() {
diff --git a/project/sourcescommon.h b/project/sourcescommon.h
index 152f1b159..d0486e326 100644
--- a/project/sourcescommon.h
+++ b/project/sourcescommon.h
@@ -43,7 +43,7 @@ public:
 	void show_context_menu(QWidget* parent, const QModelIndexList &items);
 
 	void mousePressEvent(QMouseEvent* e);
-	void mouseDoubleClickEvent(QMouseEvent* e, const QModelIndexList& selected_items);
+  void mouseDoubleClickEvent(const QModelIndexList& selected_items);
 	void dropEvent(QWidget *parent, QDropEvent* e, const QModelIndex& drop_item, const QModelIndexList &items);
 
 	void item_click(Media* m, const QModelIndex &index);
@@ -52,6 +52,8 @@ private slots:
 	void reveal_in_browser();
 	void rename_interval();
 	void item_renamed(Media *item);
+  void OpenSelectedMediaInMediaViewerFromAction();
+  void OpenSelectedMediaInMediaViewer(Media* item);
 
 	// proxy functions
 	void open_create_proxy_dialog();
diff --git a/ui/sourceiconview.cpp b/ui/sourceiconview.cpp
index d3f44d49d..f8f6bad82 100644
--- a/ui/sourceiconview.cpp
+++ b/ui/sourceiconview.cpp
@@ -73,7 +73,7 @@ void SourceIconView::dropEvent(QDropEvent* event) {
 	project_parent->sources_common->dropEvent(this, event, drop_item, selectedIndexes());
 }
 
-void SourceIconView::mouseDoubleClickEvent(QMouseEvent *event) {
+void SourceIconView::mouseDoubleClickEvent(QMouseEvent *) {
 	bool default_behavior = true;
 	if (selectedIndexes().size() == 1) {
 		Media* m = project_parent->item_to_media(selectedIndexes().at(0));
@@ -84,6 +84,6 @@ void SourceIconView::mouseDoubleClickEvent(QMouseEvent *event) {
 		}
 	}
 	if (default_behavior) {
-		project_parent->sources_common->mouseDoubleClickEvent(event, selectedIndexes());
+    project_parent->sources_common->mouseDoubleClickEvent(selectedIndexes());
 	}
 }
diff --git a/ui/sourcetable.cpp b/ui/sourcetable.cpp
index 9bf40a1f7..1a642cd6e 100644
--- a/ui/sourcetable.cpp
+++ b/ui/sourcetable.cpp
@@ -72,8 +72,8 @@ void SourceTable::mousePressEvent(QMouseEvent* event) {
 	QTreeView::mousePressEvent(event);
 }
 
-void SourceTable::mouseDoubleClickEvent(QMouseEvent* event) {
-	project_parent->sources_common->mouseDoubleClickEvent(event, selectionModel()->selectedRows());
+void SourceTable::mouseDoubleClickEvent(QMouseEvent* ) {
+  project_parent->sources_common->mouseDoubleClickEvent(selectionModel()->selectedRows());
 }
 
 void SourceTable::dragEnterEvent(QDragEnterEvent *event) {