diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
index f9f5d80a0d..4cbb3f517d 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics.cpp
@@ -393,9 +393,17 @@ void DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS::visitItem( const SCH_SHEET_PATH& aShe
         }
     }
 
-    static KICAD_T wireTypes[] = { SCH_ITEM_LOCATE_WIRE_T, SCH_LABEL_LOCATE_WIRE_T, EOT };
-    static KICAD_T busTypes[] = { SCH_ITEM_LOCATE_BUS_T, SCH_LABEL_LOCATE_BUS_T, EOT };
-    static KICAD_T schTextAndGraphics[] = { SCH_TEXT_T, SCH_ITEM_LOCATE_GRAPHIC_LINE_T, EOT };
+    static KICAD_T wireTypes[] = { SCH_ITEM_LOCATE_WIRE_T,
+                                   SCH_LABEL_LOCATE_WIRE_T,
+                                   EOT };
+    static KICAD_T busTypes[] = { SCH_ITEM_LOCATE_BUS_T,
+                                  SCH_LABEL_LOCATE_BUS_T,
+                                  EOT };
+    static KICAD_T schTextAndGraphics[] = { SCH_TEXT_T,
+                                            SCH_TEXTBOX_T,
+                                            SCH_ITEM_LOCATE_GRAPHIC_LINE_T,
+                                            SCH_SHAPE_T,
+                                            EOT };
 
     if( aItem->Type() == SCH_SYMBOL_T )
     {
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
index fdb66f8adb..7e7753fb97 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.cpp
@@ -339,7 +339,7 @@ DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_BASE::DIALOG_GLOBAL_EDIT_TEXT_AND_GRAPHICS_
 	lineStyleLabel->Wrap( -1 );
 	fgSizer1->Add( lineStyleLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-	wxString m_lineStyleChoices[] = { _("Solid"), _("Dashed"), _("Dotted"), _("Dash-Dot") };
+	wxString m_lineStyleChoices[] = { _("Solid"), _("Dashed"), _("Dotted"), _("Dash-Dot"), _("Dash-Dot-Dot") };
 	int m_lineStyleNChoices = sizeof( m_lineStyleChoices ) / sizeof( wxString );
 	m_lineStyle = new wxChoice( m_specifiedValues, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_lineStyleNChoices, m_lineStyleChoices, 0 );
 	m_lineStyle->SetSelection( 0 );
diff --git a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
index 49536ee35c..224a2b5504 100644
--- a/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
+++ b/eeschema/dialogs/dialog_global_edit_text_and_graphics_base.fbp
@@ -3638,7 +3638,7 @@
                                                     <property name="caption"></property>
                                                     <property name="caption_visible">1</property>
                                                     <property name="center_pane">0</property>
-                                                    <property name="choices">&quot;Solid&quot; &quot;Dashed&quot; &quot;Dotted&quot; &quot;Dash-Dot&quot;</property>
+                                                    <property name="choices">&quot;Solid&quot; &quot;Dashed&quot; &quot;Dotted&quot; &quot;Dash-Dot&quot; &quot;Dash-Dot-Dot&quot;</property>
                                                     <property name="close_button">1</property>
                                                     <property name="context_help"></property>
                                                     <property name="context_menu">1</property>