diff --git a/src/edt/edt/EditorOptionsPath.ui b/src/edt/edt/EditorOptionsPath.ui
index ac184b089..cf8a30249 100644
--- a/src/edt/edt/EditorOptionsPath.ui
+++ b/src/edt/edt/EditorOptionsPath.ui
@@ -56,7 +56,7 @@
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>  Width       </string>
+         <string>Width</string>
         </property>
        </widget>
       </item>
diff --git a/src/edt/edt/edtEditorOptionsPages.cc b/src/edt/edt/edtEditorOptionsPages.cc
index f050b9ca4..230b95a28 100644
--- a/src/edt/edt/edtEditorOptionsPages.cc
+++ b/src/edt/edt/edtEditorOptionsPages.cc
@@ -873,7 +873,7 @@ EditorOptionsInstPCellParam::setup (lay::Plugin *root)
 
   std::vector<tl::Variant> pv;
 
-  if (layout && mp_pcell_parameters) {
+  if (layout) {
 
     std::pair<bool, db::pcell_id_type> pc = layout->pcell_by_name (tl::to_string (m_cell_name).c_str ());
 
diff --git a/src/edt/edt/edtMainService.cc b/src/edt/edt/edtMainService.cc
index 9e2673d21..304bcb738 100644
--- a/src/edt/edt/edtMainService.cc
+++ b/src/edt/edt/edtMainService.cc
@@ -2269,12 +2269,6 @@ MainService::cm_change_layer ()
 
 }
 
-void  
-MainService::show_editor_options ()
-{
-  show_editor_options_page (view ());
-}
-
 void
 MainService::check_no_guiding_shapes ()
 {
diff --git a/src/edt/edt/edtMainService.h b/src/edt/edt/edtMainService.h
index 34bdf512d..1ae28fc79 100644
--- a/src/edt/edt/edtMainService.h
+++ b/src/edt/edt/edtMainService.h
@@ -189,11 +189,6 @@ public:
    */
   void cm_tap ();
 
-  /**
-   *  @brief Shows the editor options
-   */
-  void show_editor_options ();
-
   /** 
    *  @brief "paste" operation
    */
diff --git a/src/edt/edt/edtService.cc b/src/edt/edt/edtService.cc
index 493387153..c244213ad 100644
--- a/src/edt/edt/edtService.cc
+++ b/src/edt/edt/edtService.cc
@@ -796,10 +796,16 @@ void
 Service::activated ()
 {
   if (view ()->is_editable ()) {
+
     view ()->cancel ();  //  cancel any pending edit operations and clear the selection
     set_edit_marker (0);
+
     m_immediate = do_activated ();
     m_editing = false;
+
+    //  Show editor options panel
+    show_editor_options_page (view ());
+
   }
 
   //  make all editor option pages visible
diff --git a/src/edt/edt/edtServiceImpl.cc b/src/edt/edt/edtServiceImpl.cc
index e4a15b635..7a7ff40bf 100644
--- a/src/edt/edt/edtServiceImpl.cc
+++ b/src/edt/edt/edtServiceImpl.cc
@@ -749,12 +749,6 @@ TextService::do_activated ()
 {
   m_rot = 0;
 
-  //  Show editor options dialog to allow entering of width
-  std::vector<edt::MainService *> edt_main_services = view ()->get_plugins <edt::MainService> ();
-  if (edt_main_services.size () > 0) {
-    edt_main_services [0]->show_editor_options ();
-  }
-
   return true;  //  start editing immediately
 }
 
@@ -915,12 +909,6 @@ PathService::do_begin_edit (const db::DPoint &p)
 bool
 PathService::do_activated ()
 {
-  //  Show editor options dialog to allow entering of width
-  std::vector<edt::MainService *> edt_main_services = view ()->get_plugins <edt::MainService> ();
-  if (edt_main_services.size () > 0) {
-    edt_main_services [0]->show_editor_options ();
-  }
-
   return false;  //  don't start editing immediately
 }
 
@@ -1120,12 +1108,6 @@ InstService::properties_page (db::Manager *manager, QWidget *parent)
 bool
 InstService::do_activated ()
 {
-  //  Show editor options dialog to allow entering of parameters
-  std::vector<edt::MainService *> edt_main_services = view ()->get_plugins <edt::MainService> ();
-  if (edt_main_services.size () > 0) {
-    edt_main_services [0]->show_editor_options ();
-  }
-
   m_cv_index = view ()->active_cellview_index ();
   m_has_valid_cell = false;