diff --git a/src/widgets/ClassesWidget.cpp b/src/widgets/ClassesWidget.cpp
index d115b5e3..ad66a347 100644
--- a/src/widgets/ClassesWidget.cpp
+++ b/src/widgets/ClassesWidget.cpp
@@ -254,14 +254,38 @@ ClassesWidget::ClassesWidget(QWidget *parent) :
     ui->classesTreeView->sortByColumn(ClassesModel::TYPE, Qt::AscendingOrder);
 
     connect(Core(), SIGNAL(refreshAll()), this, SLOT(refreshClasses()));
+    connect(Core(), SIGNAL(flagsChanged()), this, SLOT(flagsChanged()));
+    connect(ui->classSourceCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(refreshClasses()));
 }
 
 ClassesWidget::~ClassesWidget() {}
 
+ClassesWidget::Source ClassesWidget::getSource()
+{
+    if (ui->classSourceCombo->currentIndex() == 1)
+    {
+        return Source::FLAGS;
+    }
+    else
+    {
+        return Source::BIN;
+    }
+}
+
+void ClassesWidget::flagsChanged()
+{
+    if (getSource() == Source::FLAGS)
+    {
+        refreshClasses();
+    }
+}
+
 void ClassesWidget::refreshClasses()
 {
     model->beginReload();
-    classes = CutterCore::getInstance()->getAllClassesFromBin();
+    classes = getSource() == Source::BIN
+              ? CutterCore::getInstance()->getAllClassesFromBin()
+              : CutterCore::getInstance()->getAllClassesFromFlags();
     model->endReload();
 
     ui->classesTreeView->resizeColumnToContents(0);
diff --git a/src/widgets/ClassesWidget.h b/src/widgets/ClassesWidget.h
index 9a21f230..30fccfba 100644
--- a/src/widgets/ClassesWidget.h
+++ b/src/widgets/ClassesWidget.h
@@ -77,8 +77,13 @@ private slots:
     void on_classesTreeView_doubleClicked(const QModelIndex &index);
 
     void refreshClasses();
+    void flagsChanged();
 
 private:
+    enum class Source { BIN, FLAGS };
+
+    Source getSource();
+
     std::unique_ptr<Ui::ClassesWidget> ui;
 
     ClassesModel *model;
diff --git a/src/widgets/ClassesWidget.ui b/src/widgets/ClassesWidget.ui
index 39ac92df..b4161f84 100644
--- a/src/widgets/ClassesWidget.ui
+++ b/src/widgets/ClassesWidget.ui
@@ -15,6 +15,9 @@
   </property>
   <widget class="QWidget" name="dockWidgetContents">
    <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>0</number>
+    </property>
     <property name="leftMargin">
      <number>0</number>
     </property>
@@ -50,6 +53,55 @@
       </property>
      </widget>
     </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_17">
+      <property name="spacing">
+       <number>10</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="classSourceLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Source:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QComboBox" name="classSourceCombo">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <item>
+         <property name="text">
+          <string>Binary Info (Fixed)</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Flags (Editable)</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+     </layout>
+    </item>
    </layout>
   </widget>
  </widget>