diff --git a/src/renderer/features/playlists/components/create-playlist-form.tsx b/src/renderer/features/playlists/components/create-playlist-form.tsx
index 404a3996..8e341499 100644
--- a/src/renderer/features/playlists/components/create-playlist-form.tsx
+++ b/src/renderer/features/playlists/components/create-playlist-form.tsx
@@ -1,8 +1,14 @@
 import { Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
-import { CreatePlaylistBody, ServerType } from '/@/renderer/api/types';
-import { Button, Switch, TextInput, toast } from '/@/renderer/components';
+import { useRef, useState } from 'react';
+import { CreatePlaylistBody, ServerType, SongListSort } from '/@/renderer/api/types';
+import { Button, Switch, Text, TextInput, toast } from '/@/renderer/components';
+import {
+  PlaylistQueryBuilder,
+  PlaylistQueryBuilderRef,
+} from '/@/renderer/features/playlists/components/playlist-query-builder';
 import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
+import { convertQueryGroupToNDQuery } from '/@/renderer/features/playlists/utils';
 import { useCurrentServer } from '/@/renderer/store';
 
 interface CreatePlaylistFormProps {
@@ -12,6 +18,7 @@ interface CreatePlaylistFormProps {
 export const CreatePlaylistForm = ({ onCancel }: CreatePlaylistFormProps) => {
   const mutation = useCreatePlaylist();
   const server = useCurrentServer();
+  const queryBuilderRef = useRef<PlaylistQueryBuilderRef>(null);
 
   const form = useForm<CreatePlaylistBody>({
     initialValues: {
@@ -23,10 +30,34 @@ export const CreatePlaylistForm = ({ onCancel }: CreatePlaylistFormProps) => {
       },
     },
   });
+  const [isSmartPlaylist, setIsSmartPlaylist] = useState(false);
 
   const handleSubmit = form.onSubmit((values) => {
+    if (isSmartPlaylist) {
+      values.ndParams = {
+        ...values.ndParams,
+        rules: queryBuilderRef.current?.getFilters(),
+      };
+    }
+
+    const smartPlaylist = queryBuilderRef.current?.getFilters();
+
     mutation.mutate(
-      { body: values },
+      {
+        body: {
+          ...values,
+          ndParams: {
+            ...values.ndParams,
+            rules:
+              isSmartPlaylist && smartPlaylist?.filters
+                ? {
+                    ...convertQueryGroupToNDQuery(smartPlaylist.filters),
+                    ...smartPlaylist.extraFilters,
+                  }
+                : undefined,
+          },
+        },
+      },
       {
         onError: (err) => {
           toast.error({ message: err.message, title: 'Error creating playlist' });
@@ -55,12 +86,34 @@ export const CreatePlaylistForm = ({ onCancel }: CreatePlaylistFormProps) => {
           label="Description"
           {...form.getInputProps('comment')}
         />
-        {isPublicDisplayed && (
-          <Switch
-            label="Is Public?"
-            {...form.getInputProps('ndParams.public')}
-          />
+        <Group>
+          {isPublicDisplayed && (
+            <Switch
+              label="Is public?"
+              {...form.getInputProps('ndParams.public')}
+            />
+          )}
+          {server?.type === ServerType.NAVIDROME && (
+            <Switch
+              label="Is smart playlist?"
+              onChange={(e) => setIsSmartPlaylist(e.currentTarget.checked)}
+            />
+          )}
+        </Group>
+        {server?.type === ServerType.NAVIDROME && isSmartPlaylist && (
+          <Stack pt="1rem">
+            <Text>Query Editor</Text>
+            <PlaylistQueryBuilder
+              ref={queryBuilderRef}
+              isSaving={false}
+              limit={undefined}
+              query={undefined}
+              sortBy={SongListSort.ALBUM}
+              sortOrder="asc"
+            />
+          </Stack>
         )}
+
         <Group position="right">
           <Button
             variant="subtle"
diff --git a/src/renderer/features/sidebar/components/sidebar.tsx b/src/renderer/features/sidebar/components/sidebar.tsx
index cd96590a..240ec979 100644
--- a/src/renderer/features/sidebar/components/sidebar.tsx
+++ b/src/renderer/features/sidebar/components/sidebar.tsx
@@ -34,10 +34,15 @@ import {
   SidebarItem,
 } from '/@/renderer/features/sidebar/components/sidebar-item';
 import { AppRoute } from '/@/renderer/router/routes';
-import { useSidebarStore, useAppStoreActions, useCurrentSong } from '/@/renderer/store';
+import {
+  useSidebarStore,
+  useAppStoreActions,
+  useCurrentSong,
+  useCurrentServer,
+} from '/@/renderer/store';
 import { fadeIn } from '/@/renderer/styles';
 import { CreatePlaylistForm, usePlaylistList } from '/@/renderer/features/playlists';
-import { LibraryItem, PlaylistListSort, SortOrder } from '/@/renderer/api/types';
+import { LibraryItem, PlaylistListSort, ServerType, SortOrder } from '/@/renderer/api/types';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 
@@ -80,6 +85,7 @@ export const Sidebar = () => {
   const sidebar = useSidebarStore();
   const { setSidebar } = useAppStoreActions();
   const imageUrl = useCurrentSong()?.imageUrl;
+  const server = useCurrentServer();
 
   const upsizedImageUrl = imageUrl
     ?.replace(/size=\d+/, 'size=300')
@@ -112,7 +118,7 @@ export const Sidebar = () => {
 
     openModal({
       children: <CreatePlaylistForm onCancel={() => closeAllModals()} />,
-      size: 'sm',
+      size: server?.type === ServerType?.NAVIDROME ? 'lg' : 'sm',
       title: 'Create Playlist',
     });
   };