diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java
index a5b63de1cbfe..7508f7c81332 100644
--- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java
+++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/action/OpenEmojiPickerAction.java
@@ -25,8 +25,7 @@ import java.util.function.Consumer;
 /**
  * An action that opens emoji picker popup, selected by user.
  */
-public class OpenEmojiPickerAction extends DumbAwareAction {
-
+final class OpenEmojiPickerAction extends DumbAwareAction {
   private static Context getContext(AnActionEvent e, boolean findOnly) {
     Editor editor = e.getData(CommonDataKeys.EDITOR);
     if (editor != null) {
@@ -104,8 +103,7 @@ public class OpenEmojiPickerAction extends DumbAwareAction {
     }
   }
 
-
-  private static class Context {
+  private static final class Context {
     private static final Context FOUND = new Context(null, null);
     private final Consumer<String> myInputCallback;
     private final Consumer<JBPopup> myPopupShowCallback;
diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiInfoPanel.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiInfoPanel.java
index 25adbd79434a..4a05b219593e 100644
--- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiInfoPanel.java
+++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiInfoPanel.java
@@ -14,7 +14,7 @@ import javax.swing.*;
 import java.awt.*;
 import java.awt.font.TextLayout;
 
-public class EmojiInfoPanel extends JPanel {
+public final class EmojiInfoPanel extends JPanel {
   private final EmojiPickerStyle myStyle;
   @NlsSafe private String myCurrentEmoji;
   @Nls private String myCurrentEmojiName;
diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiPicker.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiPicker.java
index 35f433a8a605..1b52c365d412 100644
--- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiPicker.java
+++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/ui/EmojiPicker.java
@@ -22,8 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-
-public class EmojiPicker extends JLayeredPane {
+public final class EmojiPicker extends JLayeredPane {
   private static final JBDimension DEFAULT_SIZE = new JBDimension(358, 415);
 
   private final List<EmojiCategory> myCategories;