diff --git a/src/sugar3/graphics/palette.py b/src/sugar3/graphics/palette.py
index fe4440b7..efdc9fd8 100644
--- a/src/sugar3/graphics/palette.py
+++ b/src/sugar3/graphics/palette.py
@@ -90,9 +90,6 @@ class Palette(PaletteWindow):
     display such information.
     """
 
-    PRIMARY = 0
-    SECONDARY = 1
-
     __gsignals__ = {
         'activate': (GObject.SignalFlags.RUN_FIRST, None, ([])),
     }
diff --git a/src/sugar3/graphics/palettewindow.py b/src/sugar3/graphics/palettewindow.py
index 3be7fab8..59654419 100644
--- a/src/sugar3/graphics/palettewindow.py
+++ b/src/sugar3/graphics/palettewindow.py
@@ -439,6 +439,9 @@ class PaletteWindow(GObject.GObject):
     Provides basic management of child widget, invoker, and animation.
     """
 
+    PRIMARY = 0
+    SECONDARY = 1
+
     __gsignals__ = {
         'popup': (GObject.SignalFlags.RUN_FIRST, None, ([])),
         'popdown': (GObject.SignalFlags.RUN_FIRST, None, ([])),
@@ -628,13 +631,13 @@ class PaletteWindow(GObject.GObject):
         self.on_invoker_leave()
 
     def _invoker_right_click_cb(self, invoker):
-        self.popup(immediate=True, state=1)
+        self.popup(immediate=True, state=self.SECONDARY)
 
     def _invoker_toggle_state_cb(self, invoker):
         if self.is_up():
             self.popdown(immediate=True)
         else:
-            self.popup(immediate=True, state=1)
+            self.popup(immediate=True, state=self.SECONDARY)
 
     def __enter_notify_cb(self, widget):
         self.on_enter()