diff --git a/widgets/coreWidget/viewerControl.cc b/widgets/coreWidget/viewerControl.cc
index 0a77eef2030718633c07ad625f8d79dbec85585d..f7c6c6a072f96ca01bec78f76ca002af2d3711e0 100644
--- a/widgets/coreWidget/viewerControl.cc
+++ b/widgets/coreWidget/viewerControl.cc
@@ -514,7 +514,7 @@ void CoreWidget::viewerSnapshotDialog() {
   int h = glView_->height();
   
   SnapshotDialog dialog(suggest, true, w, h, 0);
-  
+
   bool ok = dialog.exec();
 
   if (ok){
@@ -551,6 +551,23 @@ void CoreWidget::viewerSnapshotDialog() {
 
         if (!comments.isEmpty())
             finalImage.setText("Mesh Comments", comments);
+        if (dialog.metaData_storeView_cb->isChecked()) {
+            QSize window_size;
+            if (isMaximized())
+              window_size = QSize(0,0);
+            else
+              window_size = QSize (width(),height());
+
+            int splitter_size = 0;
+            if (OpenFlipperSettings().value("Core/Gui/ToolBoxes/ToolBoxOnTheRight",true).toBool())
+              splitter_size = toolSplitter_->sizes()[1];
+            else
+              splitter_size = toolSplitter_->sizes()[0];
+
+            QString view;
+            examiner_widgets_[PluginFunctions::activeExaminer()]->encodeView(view, window_size, splitter_size);
+            finalImage.setText("View", view);
+        }
         finalImage.save(newName);
 
         break;
diff --git a/widgets/snapshotDialog/SnapshotDialog.ui b/widgets/snapshotDialog/SnapshotDialog.ui
index 17db4c4f649793165d7b5e67c6304da0347185e5..803cb6600399dff04c434da0f6361acfd0f6b173 100644
--- a/widgets/snapshotDialog/SnapshotDialog.ui
+++ b/widgets/snapshotDialog/SnapshotDialog.ui
@@ -230,10 +230,10 @@ Allowed values: any number between 2 and 16.</string>
    <item>
     <widget class="QGroupBox" name="groupBox_3">
      <property name="toolTip">
-      <string>Use e.g. ImageMagick (&quot;identify --verbose &lt;filename&gt;&quot;) to display the image file's meta data.</string>
+      <string>Use e.g. ImageMagick (&quot;identify -verbose &lt;filename&gt;&quot;) to display the image file's meta data.</string>
      </property>
      <property name="title">
-      <string>Image Meta Data</string>
+      <string>Image Meta Data*</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
@@ -250,7 +250,7 @@ Allowed values: any number between 2 and 16.</string>
        <widget class="QWidget" name="widget" native="true">
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <property name="leftMargin">
-          <number>9</number>
+          <number>16</number>
          </property>
          <property name="topMargin">
           <number>0</number>
@@ -281,6 +281,37 @@ Allowed values: any number between 2 and 16.</string>
         </layout>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="metaData_storeView_cb">
+        <property name="text">
+         <string>Store View Settings</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_5">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <pointsize>8</pointsize>
+         </font>
+        </property>
+        <property name="text">
+         <string>* If you have ImageMagick use &quot;identify -verbose &lt;file&gt;&quot; to display meta data.</string>
+        </property>
+        <property name="wordWrap">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>