diff --git a/toonz/sources/tnztools/stylepickertool.cpp b/toonz/sources/tnztools/stylepickertool.cpp
index bcfe616..b8b7d77 100644
--- a/toonz/sources/tnztools/stylepickertool.cpp
+++ b/toonz/sources/tnztools/stylepickertool.cpp
@@ -213,6 +213,15 @@ void StylePickerTool::mouseMove(const TPointD &pos, const TMouseEvent &e) {
 
 int StylePickerTool::getCursorId() const {
   int ret;
+
+  if (!Preferences::instance()->isMultiLayerStylePickerEnabled()) {
+    TImageP img      = getImage(false);
+    TVectorImageP vi = img;
+    TToonzImageP ti  = img;
+
+    if (!vi && !ti) return ToolCursor::CURSOR_NO;
+  }
+
   /* in case the "organize palette" option is active */
   if (m_organizePalette.getValue())
     ret = ToolCursor::PickerCursorOrganize;
diff --git a/toonz/sources/tnztools/typetool.cpp b/toonz/sources/tnztools/typetool.cpp
index 8c985c8..3b7c9d2 100644
--- a/toonz/sources/tnztools/typetool.cpp
+++ b/toonz/sources/tnztools/typetool.cpp
@@ -422,7 +422,7 @@ TypeTool::TypeTool()
     , m_vertical("Vertical Orientation", false)  // W_ToolOptions_Vertical
     , m_size("Size:")                            // W_ToolOptions_Size
     , m_undo(0) {
-  bind(TTool::CommonLevels | TTool::EmptyTarget);
+  bind(TTool::VectorImage | TTool::ToonzImage | TTool::EmptyTarget);
   m_prop[0].bind(m_fontFamilyMenu);
   // Su mac non e' visibile il menu dello style perche' e' stato inserito nel
   // nome