diff --git a/src/TableBrowser.cpp b/src/TableBrowser.cpp
index ef5d7f05..f0e8009b 100644
--- a/src/TableBrowser.cpp
+++ b/src/TableBrowser.cpp
@@ -50,6 +50,7 @@ TableBrowser::TableBrowser(DBBrowserDB* _db, QWidget* parent) :
 
     popupSaveFilterAsMenu = new QMenu(this);
     popupSaveFilterAsMenu->addAction(ui->actionFilteredTableExportCsv);
+    popupSaveFilterAsMenu->addAction(ui->actionFilteredTableExportJson);
     popupSaveFilterAsMenu->addAction(ui->actionFilterSaveAsView);
     ui->actionSaveFilterAsPopup->setMenu(popupSaveFilterAsMenu);
     qobject_cast<QToolButton*>(ui->browseToolbar->widgetForAction(ui->actionSaveFilterAsPopup))->setPopupMode(QToolButton::InstantPopup);
@@ -1403,12 +1404,18 @@ void TableBrowser::editDisplayFormat()
     }
 }
 
-void TableBrowser::exportFilteredTable()
+void TableBrowser::exportCsvFilteredTable()
 {
     ExportDataDialog dialog(*db, ExportDataDialog::ExportFormatCsv, this, m_model->customQuery(false));
     dialog.exec();
 }
 
+void TableBrowser::exportJsonFilteredTable()
+{
+    ExportDataDialog dialog(*db, ExportDataDialog::ExportFormatJson, this, m_model->customQuery(false));
+    dialog.exec();
+}
+
 void TableBrowser::saveFilterAsView()
 {
     // Save as view a custom query without rowid
diff --git a/src/TableBrowser.h b/src/TableBrowser.h
index 3a694669..74293dda 100644
--- a/src/TableBrowser.h
+++ b/src/TableBrowser.h
@@ -130,7 +130,8 @@ private slots:
     void on_actionClearFilters_triggered();
     void on_actionClearSorting_triggered();
     void editDisplayFormat();
-    void exportFilteredTable();
+    void exportCsvFilteredTable();
+    void exportJsonFilteredTable();
     void saveFilterAsView();
     void setTableEncoding(bool forAllTables = false);
     void setDefaultTableEncoding();
diff --git a/src/TableBrowser.ui b/src/TableBrowser.ui
index dd351d83..9e85794f 100644
--- a/src/TableBrowser.ui
+++ b/src/TableBrowser.ui
@@ -670,6 +670,20 @@
     <string>This button exports the data of the browsed table as currently displayed (after filters, display formats and order column) as a CSV file.</string>
    </property>
   </action>
+  <action name="actionFilteredTableExportJson">
+   <property name="text">
+    <string>Export to &amp;JSON</string>
+   </property>
+   <property name="toolTip">
+    <string>Export the filtered data to JSON</string>
+   </property>
+   <property name="statusTip">
+    <string>Export the filtered data to JSON</string>
+   </property>
+   <property name="whatsThis">
+    <string>This button exports the data of the browsed table as currently displayed (after filters, display formats and order column) as a JSON file.</string>
+   </property>
+  </action>
   <action name="actionFilterSaveAsView">
    <property name="text">
     <string>Save as &amp;view</string>
@@ -1324,7 +1338,23 @@
    <sender>actionFilteredTableExportCsv</sender>
    <signal>triggered()</signal>
    <receiver>TableBrowser</receiver>
-   <slot>exportFilteredTable()</slot>
+   <slot>exportCsvFilteredTable()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>518</x>
+     <y>314</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionFilteredTableExportJson</sender>
+   <signal>triggered()</signal>
+   <receiver>TableBrowser</receiver>
+   <slot>exportJsonFilteredTable()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>-1</x>
@@ -1431,7 +1461,8 @@
   <slot>addRecord()</slot>
   <slot>deleteRecord()</slot>
   <slot>insertValues()</slot>
-  <slot>exportFilteredTable</slot>
+  <slot>exportCsvFilteredTable</slot>
+  <slot>exportJsonFilteredTable</slot>
   <slot>saveFilterAsView</slot>
   <slot>setDefaultTableEncoding()</slot>
   <slot>hideColumns()</slot>